diff --git a/Developer Guide/BusAux_Schematic_V13.pptx b/Documentation/Developer Guide/BusAux_Schematic_V13.pptx similarity index 100% rename from Developer Guide/BusAux_Schematic_V13.pptx rename to Documentation/Developer Guide/BusAux_Schematic_V13.pptx diff --git a/Developer Guide/Pics.pptx b/Documentation/Developer Guide/Pics.pptx similarity index 100% rename from Developer Guide/Pics.pptx rename to Documentation/Developer Guide/Pics.pptx diff --git a/Developer Guide/SSHVAC_V07_final.zip b/Documentation/Developer Guide/SSHVAC_V07_final.zip similarity index 100% rename from Developer Guide/SSHVAC_V07_final.zip rename to Documentation/Developer Guide/SSHVAC_V07_final.zip diff --git a/Developer Guide/Segment Table Description.xlsx b/Documentation/Developer Guide/Segment Table Description.xlsx similarity index 100% rename from Developer Guide/Segment Table Description.xlsx rename to Documentation/Developer Guide/Segment Table Description.xlsx diff --git a/Developer Guide/VECTO Developer Guide.docx b/Documentation/Developer Guide/VECTO Developer Guide.docx similarity index 100% rename from Developer Guide/VECTO Developer Guide.docx rename to Documentation/Developer Guide/VECTO Developer Guide.docx diff --git a/Developer Guide/VECTO-AAUX Developer Guide_7Aug15.docx b/Documentation/Developer Guide/VECTO-AAUX Developer Guide_7Aug15.docx similarity index 100% rename from Developer Guide/VECTO-AAUX Developer Guide_7Aug15.docx rename to Documentation/Developer Guide/VECTO-AAUX Developer Guide_7Aug15.docx diff --git a/User Manual/1-user-interface/0_start.md b/Documentation/User Manual/1-user-interface/0_start.md similarity index 100% rename from User Manual/1-user-interface/0_start.md rename to Documentation/User Manual/1-user-interface/0_start.md diff --git a/User Manual/1-user-interface/A_index.md b/Documentation/User Manual/1-user-interface/A_index.md similarity index 100% rename from User Manual/1-user-interface/A_index.md rename to Documentation/User Manual/1-user-interface/A_index.md diff --git a/User Manual/1-user-interface/B_mainform.md b/Documentation/User Manual/1-user-interface/B_mainform.md similarity index 100% rename from User Manual/1-user-interface/B_mainform.md rename to Documentation/User Manual/1-user-interface/B_mainform.md diff --git a/User Manual/1-user-interface/C_settings.md b/Documentation/User Manual/1-user-interface/C_settings.md similarity index 100% rename from User Manual/1-user-interface/C_settings.md rename to Documentation/User Manual/1-user-interface/C_settings.md diff --git a/User Manual/1-user-interface/D_VECTO-Job-Editor.md b/Documentation/User Manual/1-user-interface/D_VECTO-Job-Editor.md similarity index 100% rename from User Manual/1-user-interface/D_VECTO-Job-Editor.md rename to Documentation/User Manual/1-user-interface/D_VECTO-Job-Editor.md diff --git a/User Manual/1-user-interface/E_VECTO-Editor_Aux.md b/Documentation/User Manual/1-user-interface/E_VECTO-Editor_Aux.md similarity index 100% rename from User Manual/1-user-interface/E_VECTO-Editor_Aux.md rename to Documentation/User Manual/1-user-interface/E_VECTO-Editor_Aux.md diff --git a/User Manual/1-user-interface/F_VEH-Editor.md b/Documentation/User Manual/1-user-interface/F_VEH-Editor.md similarity index 100% rename from User Manual/1-user-interface/F_VEH-Editor.md rename to Documentation/User Manual/1-user-interface/F_VEH-Editor.md diff --git a/User Manual/1-user-interface/G_ENG-Editor.md b/Documentation/User Manual/1-user-interface/G_ENG-Editor.md similarity index 100% rename from User Manual/1-user-interface/G_ENG-Editor.md rename to Documentation/User Manual/1-user-interface/G_ENG-Editor.md diff --git a/User Manual/1-user-interface/H_GBX-Editor.md b/Documentation/User Manual/1-user-interface/H_GBX-Editor.md similarity index 100% rename from User Manual/1-user-interface/H_GBX-Editor.md rename to Documentation/User Manual/1-user-interface/H_GBX-Editor.md diff --git a/User Manual/1-user-interface/I_Graph.md b/Documentation/User Manual/1-user-interface/I_Graph.md similarity index 100% rename from User Manual/1-user-interface/I_Graph.md rename to Documentation/User Manual/1-user-interface/I_Graph.md diff --git a/User Manual/1-user-interface/J_cmd.md b/Documentation/User Manual/1-user-interface/J_cmd.md similarity index 100% rename from User Manual/1-user-interface/J_cmd.md rename to Documentation/User Manual/1-user-interface/J_cmd.md diff --git a/User Manual/2-calculation-modes/batch.md b/Documentation/User Manual/2-calculation-modes/batch.md similarity index 100% rename from User Manual/2-calculation-modes/batch.md rename to Documentation/User Manual/2-calculation-modes/batch.md diff --git a/User Manual/2-calculation-modes/calculation-modes.md b/Documentation/User Manual/2-calculation-modes/calculation-modes.md similarity index 100% rename from User Manual/2-calculation-modes/calculation-modes.md rename to Documentation/User Manual/2-calculation-modes/calculation-modes.md diff --git a/User Manual/2-calculation-modes/declaration.md b/Documentation/User Manual/2-calculation-modes/declaration.md similarity index 100% rename from User Manual/2-calculation-modes/declaration.md rename to Documentation/User Manual/2-calculation-modes/declaration.md diff --git a/User Manual/2-calculation-modes/engine-only.md b/Documentation/User Manual/2-calculation-modes/engine-only.md similarity index 100% rename from User Manual/2-calculation-modes/engine-only.md rename to Documentation/User Manual/2-calculation-modes/engine-only.md diff --git a/User Manual/2-calculation-modes/engineering.md b/Documentation/User Manual/2-calculation-modes/engineering.md similarity index 100% rename from User Manual/2-calculation-modes/engineering.md rename to Documentation/User Manual/2-calculation-modes/engineering.md diff --git a/User Manual/3-simulation-models/ADAS_EcoRoll.md b/Documentation/User Manual/3-simulation-models/ADAS_EcoRoll.md similarity index 100% rename from User Manual/3-simulation-models/ADAS_EcoRoll.md rename to Documentation/User Manual/3-simulation-models/ADAS_EcoRoll.md diff --git a/User Manual/3-simulation-models/Auxiliaries.md b/Documentation/User Manual/3-simulation-models/Auxiliaries.md similarity index 100% rename from User Manual/3-simulation-models/Auxiliaries.md rename to Documentation/User Manual/3-simulation-models/Auxiliaries.md diff --git a/User Manual/3-simulation-models/Driver_AccLimit.md b/Documentation/User Manual/3-simulation-models/Driver_AccLimit.md similarity index 100% rename from User Manual/3-simulation-models/Driver_AccLimit.md rename to Documentation/User Manual/3-simulation-models/Driver_AccLimit.md diff --git a/User Manual/3-simulation-models/Driver_LAC.md b/Documentation/User Manual/3-simulation-models/Driver_LAC.md similarity index 100% rename from User Manual/3-simulation-models/Driver_LAC.md rename to Documentation/User Manual/3-simulation-models/Driver_LAC.md diff --git a/User Manual/3-simulation-models/Engine_DynamicFullLoad.md b/Documentation/User Manual/3-simulation-models/Engine_DynamicFullLoad.md similarity index 100% rename from User Manual/3-simulation-models/Engine_DynamicFullLoad.md rename to Documentation/User Manual/3-simulation-models/Engine_DynamicFullLoad.md diff --git a/User Manual/3-simulation-models/Engine_FC.md b/Documentation/User Manual/3-simulation-models/Engine_FC.md similarity index 100% rename from User Manual/3-simulation-models/Engine_FC.md rename to Documentation/User Manual/3-simulation-models/Engine_FC.md diff --git a/User Manual/3-simulation-models/Engine_StartStop.md b/Documentation/User Manual/3-simulation-models/Engine_StartStop.md similarity index 100% rename from User Manual/3-simulation-models/Engine_StartStop.md rename to Documentation/User Manual/3-simulation-models/Engine_StartStop.md diff --git a/User Manual/3-simulation-models/Engine_WHTC.md b/Documentation/User Manual/3-simulation-models/Engine_WHTC.md similarity index 100% rename from User Manual/3-simulation-models/Engine_WHTC.md rename to Documentation/User Manual/3-simulation-models/Engine_WHTC.md diff --git a/User Manual/3-simulation-models/GearShift.md b/Documentation/User Manual/3-simulation-models/GearShift.md similarity index 100% rename from User Manual/3-simulation-models/GearShift.md rename to Documentation/User Manual/3-simulation-models/GearShift.md diff --git a/User Manual/3-simulation-models/PwheelInput.md b/Documentation/User Manual/3-simulation-models/PwheelInput.md similarity index 100% rename from User Manual/3-simulation-models/PwheelInput.md rename to Documentation/User Manual/3-simulation-models/PwheelInput.md diff --git a/User Manual/3-simulation-models/TC.md b/Documentation/User Manual/3-simulation-models/TC.md similarity index 100% rename from User Manual/3-simulation-models/TC.md rename to Documentation/User Manual/3-simulation-models/TC.md diff --git a/User Manual/3-simulation-models/Vehicle_CrossWindCorrection.md b/Documentation/User Manual/3-simulation-models/Vehicle_CrossWindCorrection.md similarity index 100% rename from User Manual/3-simulation-models/Vehicle_CrossWindCorrection.md rename to Documentation/User Manual/3-simulation-models/Vehicle_CrossWindCorrection.md diff --git a/User Manual/3-simulation-models/Vehicle_RRC.md b/Documentation/User Manual/3-simulation-models/Vehicle_RRC.md similarity index 100% rename from User Manual/3-simulation-models/Vehicle_RRC.md rename to Documentation/User Manual/3-simulation-models/Vehicle_RRC.md diff --git a/User Manual/3-simulation-models/simulation-models.md b/Documentation/User Manual/3-simulation-models/simulation-models.md similarity index 100% rename from User Manual/3-simulation-models/simulation-models.md rename to Documentation/User Manual/3-simulation-models/simulation-models.md diff --git a/User Manual/4-command-line-arguments/cmd.md b/Documentation/User Manual/4-command-line-arguments/cmd.md similarity index 100% rename from User Manual/4-command-line-arguments/cmd.md rename to Documentation/User Manual/4-command-line-arguments/cmd.md diff --git a/User Manual/5-input-and-output-files/App.md b/Documentation/User Manual/5-input-and-output-files/App.md similarity index 100% rename from User Manual/5-input-and-output-files/App.md rename to Documentation/User Manual/5-input-and-output-files/App.md diff --git a/User Manual/5-input-and-output-files/CSV.md b/Documentation/User Manual/5-input-and-output-files/CSV.md similarity index 100% rename from User Manual/5-input-and-output-files/CSV.md rename to Documentation/User Manual/5-input-and-output-files/CSV.md diff --git a/User Manual/5-input-and-output-files/JSON.md b/Documentation/User Manual/5-input-and-output-files/JSON.md similarity index 100% rename from User Manual/5-input-and-output-files/JSON.md rename to Documentation/User Manual/5-input-and-output-files/JSON.md diff --git a/User Manual/5-input-and-output-files/VACC.md b/Documentation/User Manual/5-input-and-output-files/VACC.md similarity index 100% rename from User Manual/5-input-and-output-files/VACC.md rename to Documentation/User Manual/5-input-and-output-files/VACC.md diff --git a/User Manual/5-input-and-output-files/VAUX.md b/Documentation/User Manual/5-input-and-output-files/VAUX.md similarity index 100% rename from User Manual/5-input-and-output-files/VAUX.md rename to Documentation/User Manual/5-input-and-output-files/VAUX.md diff --git a/User Manual/5-input-and-output-files/VCDB.md b/Documentation/User Manual/5-input-and-output-files/VCDB.md similarity index 100% rename from User Manual/5-input-and-output-files/VCDB.md rename to Documentation/User Manual/5-input-and-output-files/VCDB.md diff --git a/User Manual/5-input-and-output-files/VCDV.md b/Documentation/User Manual/5-input-and-output-files/VCDV.md similarity index 100% rename from User Manual/5-input-and-output-files/VCDV.md rename to Documentation/User Manual/5-input-and-output-files/VCDV.md diff --git a/User Manual/5-input-and-output-files/VDRI.md b/Documentation/User Manual/5-input-and-output-files/VDRI.md similarity index 100% rename from User Manual/5-input-and-output-files/VDRI.md rename to Documentation/User Manual/5-input-and-output-files/VDRI.md diff --git a/User Manual/5-input-and-output-files/VECTO.md b/Documentation/User Manual/5-input-and-output-files/VECTO.md similarity index 100% rename from User Manual/5-input-and-output-files/VECTO.md rename to Documentation/User Manual/5-input-and-output-files/VECTO.md diff --git a/User Manual/5-input-and-output-files/VENG.md b/Documentation/User Manual/5-input-and-output-files/VENG.md similarity index 100% rename from User Manual/5-input-and-output-files/VENG.md rename to Documentation/User Manual/5-input-and-output-files/VENG.md diff --git a/User Manual/5-input-and-output-files/VFLD.md b/Documentation/User Manual/5-input-and-output-files/VFLD.md similarity index 100% rename from User Manual/5-input-and-output-files/VFLD.md rename to Documentation/User Manual/5-input-and-output-files/VFLD.md diff --git a/User Manual/5-input-and-output-files/VGBS.md b/Documentation/User Manual/5-input-and-output-files/VGBS.md similarity index 100% rename from User Manual/5-input-and-output-files/VGBS.md rename to Documentation/User Manual/5-input-and-output-files/VGBS.md diff --git a/User Manual/5-input-and-output-files/VGBX.md b/Documentation/User Manual/5-input-and-output-files/VGBX.md similarity index 100% rename from User Manual/5-input-and-output-files/VGBX.md rename to Documentation/User Manual/5-input-and-output-files/VGBX.md diff --git a/User Manual/5-input-and-output-files/VMAP.md b/Documentation/User Manual/5-input-and-output-files/VMAP.md similarity index 100% rename from User Manual/5-input-and-output-files/VMAP.md rename to Documentation/User Manual/5-input-and-output-files/VMAP.md diff --git a/User Manual/5-input-and-output-files/VMOD.md b/Documentation/User Manual/5-input-and-output-files/VMOD.md similarity index 100% rename from User Manual/5-input-and-output-files/VMOD.md rename to Documentation/User Manual/5-input-and-output-files/VMOD.md diff --git a/User Manual/5-input-and-output-files/VRLM.md b/Documentation/User Manual/5-input-and-output-files/VRLM.md similarity index 100% rename from User Manual/5-input-and-output-files/VRLM.md rename to Documentation/User Manual/5-input-and-output-files/VRLM.md diff --git a/User Manual/5-input-and-output-files/VSUM.md b/Documentation/User Manual/5-input-and-output-files/VSUM.md similarity index 100% rename from User Manual/5-input-and-output-files/VSUM.md rename to Documentation/User Manual/5-input-and-output-files/VSUM.md diff --git a/User Manual/5-input-and-output-files/VTCC.md b/Documentation/User Manual/5-input-and-output-files/VTCC.md similarity index 100% rename from User Manual/5-input-and-output-files/VTCC.md rename to Documentation/User Manual/5-input-and-output-files/VTCC.md diff --git a/User Manual/5-input-and-output-files/VTLM.md b/Documentation/User Manual/5-input-and-output-files/VTLM.md similarity index 100% rename from User Manual/5-input-and-output-files/VTLM.md rename to Documentation/User Manual/5-input-and-output-files/VTLM.md diff --git a/User Manual/5-input-and-output-files/VVEH.md b/Documentation/User Manual/5-input-and-output-files/VVEH.md similarity index 100% rename from User Manual/5-input-and-output-files/VVEH.md rename to Documentation/User Manual/5-input-and-output-files/VVEH.md diff --git a/User Manual/5-input-and-output-files/input-output.md b/Documentation/User Manual/5-input-and-output-files/input-output.md similarity index 100% rename from User Manual/5-input-and-output-files/input-output.md rename to Documentation/User Manual/5-input-and-output-files/input-output.md diff --git a/User Manual/6-changelog/changelog.md b/Documentation/User Manual/6-changelog/changelog.md similarity index 100% rename from User Manual/6-changelog/changelog.md rename to Documentation/User Manual/6-changelog/changelog.md diff --git a/User Manual/AAux/AALT.html b/Documentation/User Manual/AAux/AALT.html similarity index 100% rename from User Manual/AAux/AALT.html rename to Documentation/User Manual/AAux/AALT.html diff --git a/User Manual/AAux/AA_Electrical.html b/Documentation/User Manual/AAux/AA_Electrical.html similarity index 100% rename from User Manual/AAux/AA_Electrical.html rename to Documentation/User Manual/AAux/AA_Electrical.html diff --git a/User Manual/AAux/AA_HVAC.html b/Documentation/User Manual/AAux/AA_HVAC.html similarity index 100% rename from User Manual/AAux/AA_HVAC.html rename to Documentation/User Manual/AAux/AA_HVAC.html diff --git a/User Manual/AAux/AA_Pneumatic.html b/Documentation/User Manual/AAux/AA_Pneumatic.html similarity index 100% rename from User Manual/AAux/AA_Pneumatic.html rename to Documentation/User Manual/AAux/AA_Pneumatic.html diff --git a/User Manual/AAux/AAux-Editor.html b/Documentation/User Manual/AAux/AAux-Editor.html similarity index 100% rename from User Manual/AAux/AAux-Editor.html rename to Documentation/User Manual/AAux/AAux-Editor.html diff --git a/User Manual/AAux/ACMP.html b/Documentation/User Manual/AAux/ACMP.html similarity index 100% rename from User Manual/AAux/ACMP.html rename to Documentation/User Manual/AAux/ACMP.html diff --git a/User Manual/AAux/AENV.html b/Documentation/User Manual/AAux/AENV.html similarity index 100% rename from User Manual/AAux/AENV.html rename to Documentation/User Manual/AAux/AENV.html diff --git a/User Manual/AAux/APAC.html b/Documentation/User Manual/AAux/APAC.html similarity index 100% rename from User Manual/AAux/APAC.html rename to Documentation/User Manual/AAux/APAC.html diff --git a/User Manual/AAux/BusAux_Schematic_V13.pptx b/Documentation/User Manual/AAux/BusAux_Schematic_V13.pptx similarity index 100% rename from User Manual/AAux/BusAux_Schematic_V13.pptx rename to Documentation/User Manual/AAux/BusAux_Schematic_V13.pptx diff --git a/User Manual/AAux/Pics/AALT-Editor.jpg b/Documentation/User Manual/AAux/Pics/AALT-Editor.jpg similarity index 100% rename from User Manual/AAux/Pics/AALT-Editor.jpg rename to Documentation/User Manual/AAux/Pics/AALT-Editor.jpg diff --git a/User Manual/AAux/Pics/AALT-Editor_Diagnostics.png b/Documentation/User Manual/AAux/Pics/AALT-Editor_Diagnostics.png similarity index 100% rename from User Manual/AAux/Pics/AALT-Editor_Diagnostics.png rename to Documentation/User Manual/AAux/Pics/AALT-Editor_Diagnostics.png diff --git a/User Manual/AAux/Pics/AA_Electrics.jpg b/Documentation/User Manual/AAux/Pics/AA_Electrics.jpg similarity index 100% rename from User Manual/AAux/Pics/AA_Electrics.jpg rename to Documentation/User Manual/AAux/Pics/AA_Electrics.jpg diff --git a/User Manual/AAux/Pics/AA_Electrics_RC.jpg b/Documentation/User Manual/AAux/Pics/AA_Electrics_RC.jpg similarity index 100% rename from User Manual/AAux/Pics/AA_Electrics_RC.jpg rename to Documentation/User Manual/AAux/Pics/AA_Electrics_RC.jpg diff --git a/User Manual/AAux/Pics/AA_HVAC.jpg b/Documentation/User Manual/AAux/Pics/AA_HVAC.jpg similarity index 100% rename from User Manual/AAux/Pics/AA_HVAC.jpg rename to Documentation/User Manual/AAux/Pics/AA_HVAC.jpg diff --git a/User Manual/AAux/Pics/AA_Open-Create AALT.jpg b/Documentation/User Manual/AAux/Pics/AA_Open-Create AALT.jpg similarity index 100% rename from User Manual/AAux/Pics/AA_Open-Create AALT.jpg rename to Documentation/User Manual/AAux/Pics/AA_Open-Create AALT.jpg diff --git a/User Manual/AAux/Pics/AA_Open-Create AAUX.jpg b/Documentation/User Manual/AAux/Pics/AA_Open-Create AAUX.jpg similarity index 100% rename from User Manual/AAux/Pics/AA_Open-Create AAUX.jpg rename to Documentation/User Manual/AAux/Pics/AA_Open-Create AAUX.jpg diff --git a/User Manual/AAux/Pics/AA_Open-Create ABDB.jpg b/Documentation/User Manual/AAux/Pics/AA_Open-Create ABDB.jpg similarity index 100% rename from User Manual/AAux/Pics/AA_Open-Create ABDB.jpg rename to Documentation/User Manual/AAux/Pics/AA_Open-Create ABDB.jpg diff --git a/User Manual/AAux/Pics/AA_Open-Create ACMP.jpg b/Documentation/User Manual/AAux/Pics/AA_Open-Create ACMP.jpg similarity index 100% rename from User Manual/AAux/Pics/AA_Open-Create ACMP.jpg rename to Documentation/User Manual/AAux/Pics/AA_Open-Create ACMP.jpg diff --git a/User Manual/AAux/Pics/AA_Open-Create AENV.jpg b/Documentation/User Manual/AAux/Pics/AA_Open-Create AENV.jpg similarity index 100% rename from User Manual/AAux/Pics/AA_Open-Create AENV.jpg rename to Documentation/User Manual/AAux/Pics/AA_Open-Create AENV.jpg diff --git a/User Manual/AAux/Pics/AA_Open-Create AHSM.jpg b/Documentation/User Manual/AAux/Pics/AA_Open-Create AHSM.jpg similarity index 100% rename from User Manual/AAux/Pics/AA_Open-Create AHSM.jpg rename to Documentation/User Manual/AAux/Pics/AA_Open-Create AHSM.jpg diff --git a/User Manual/AAux/Pics/AA_Open-Create APAC.jpg b/Documentation/User Manual/AAux/Pics/AA_Open-Create APAC.jpg similarity index 100% rename from User Manual/AAux/Pics/AA_Open-Create APAC.jpg rename to Documentation/User Manual/AAux/Pics/AA_Open-Create APAC.jpg diff --git a/User Manual/AAux/Pics/AA_Pneumatics.jpg b/Documentation/User Manual/AAux/Pics/AA_Pneumatics.jpg similarity index 100% rename from User Manual/AAux/Pics/AA_Pneumatics.jpg rename to Documentation/User Manual/AAux/Pics/AA_Pneumatics.jpg diff --git a/User Manual/AAux/Pics/AA_Select AA.jpg b/Documentation/User Manual/AAux/Pics/AA_Select AA.jpg similarity index 100% rename from User Manual/AAux/Pics/AA_Select AA.jpg rename to Documentation/User Manual/AAux/Pics/AA_Select AA.jpg diff --git a/User Manual/AAux/Pics/AA_Selected AA File.jpg b/Documentation/User Manual/AAux/Pics/AA_Selected AA File.jpg similarity index 100% rename from User Manual/AAux/Pics/AA_Selected AA File.jpg rename to Documentation/User Manual/AAux/Pics/AA_Selected AA File.jpg diff --git a/User Manual/AAux/Pics/AA_implementation.jpg b/Documentation/User Manual/AAux/Pics/AA_implementation.jpg similarity index 100% rename from User Manual/AAux/Pics/AA_implementation.jpg rename to Documentation/User Manual/AAux/Pics/AA_implementation.jpg diff --git a/User Manual/AAux/Pics/AA_select.jpg b/Documentation/User Manual/AAux/Pics/AA_select.jpg similarity index 100% rename from User Manual/AAux/Pics/AA_select.jpg rename to Documentation/User Manual/AAux/Pics/AA_select.jpg diff --git a/User Manual/AAux/Pics/Add-icon.png b/Documentation/User Manual/AAux/Pics/Add-icon.png similarity index 100% rename from User Manual/AAux/Pics/Add-icon.png rename to Documentation/User Manual/AAux/Pics/Add-icon.png diff --git a/User Manual/AAux/Pics/Clear-icon.png b/Documentation/User Manual/AAux/Pics/Clear-icon.png similarity index 100% rename from User Manual/AAux/Pics/Clear-icon.png rename to Documentation/User Manual/AAux/Pics/Clear-icon.png diff --git a/User Manual/AAux/Pics/CombAltSchem.png b/Documentation/User Manual/AAux/Pics/CombAltSchem.png similarity index 100% rename from User Manual/AAux/Pics/CombAltSchem.png rename to Documentation/User Manual/AAux/Pics/CombAltSchem.png diff --git a/User Manual/AAux/Pics/CombAlt_Method1.png b/Documentation/User Manual/AAux/Pics/CombAlt_Method1.png similarity index 100% rename from User Manual/AAux/Pics/CombAlt_Method1.png rename to Documentation/User Manual/AAux/Pics/CombAlt_Method1.png diff --git a/User Manual/AAux/Pics/CombAlt_Method2.png b/Documentation/User Manual/AAux/Pics/CombAlt_Method2.png similarity index 100% rename from User Manual/AAux/Pics/CombAlt_Method2.png rename to Documentation/User Manual/AAux/Pics/CombAlt_Method2.png diff --git a/User Manual/AAux/Pics/Delete-icon.png b/Documentation/User Manual/AAux/Pics/Delete-icon.png similarity index 100% rename from User Manual/AAux/Pics/Delete-icon.png rename to Documentation/User Manual/AAux/Pics/Delete-icon.png diff --git a/User Manual/AAux/Pics/ExampleAltMap.png b/Documentation/User Manual/AAux/Pics/ExampleAltMap.png similarity index 100% rename from User Manual/AAux/Pics/ExampleAltMap.png rename to Documentation/User Manual/AAux/Pics/ExampleAltMap.png diff --git a/User Manual/AAux/Pics/HVAC_BoundaryConditions.jpg b/Documentation/User Manual/AAux/Pics/HVAC_BoundaryConditions.jpg similarity index 100% rename from User Manual/AAux/Pics/HVAC_BoundaryConditions.jpg rename to Documentation/User Manual/AAux/Pics/HVAC_BoundaryConditions.jpg diff --git a/User Manual/AAux/Pics/HVAC_BusParameters.jpg b/Documentation/User Manual/AAux/Pics/HVAC_BusParameters.jpg similarity index 100% rename from User Manual/AAux/Pics/HVAC_BusParameters.jpg rename to Documentation/User Manual/AAux/Pics/HVAC_BusParameters.jpg diff --git a/User Manual/AAux/Pics/HVAC_Diagnostics.jpg b/Documentation/User Manual/AAux/Pics/HVAC_Diagnostics.jpg similarity index 100% rename from User Manual/AAux/Pics/HVAC_Diagnostics.jpg rename to Documentation/User Manual/AAux/Pics/HVAC_Diagnostics.jpg diff --git a/User Manual/AAux/Pics/HVAC_Other.jpg b/Documentation/User Manual/AAux/Pics/HVAC_Other.jpg similarity index 100% rename from User Manual/AAux/Pics/HVAC_Other.jpg rename to Documentation/User Manual/AAux/Pics/HVAC_Other.jpg diff --git a/User Manual/AAux/Pics/HVAC_TechList.jpg b/Documentation/User Manual/AAux/Pics/HVAC_TechList.jpg similarity index 100% rename from User Manual/AAux/Pics/HVAC_TechList.jpg rename to Documentation/User Manual/AAux/Pics/HVAC_TechList.jpg diff --git a/User Manual/AAux/Pics/Information-icon.png b/Documentation/User Manual/AAux/Pics/Information-icon.png similarity index 100% rename from User Manual/AAux/Pics/Information-icon.png rename to Documentation/User Manual/AAux/Pics/Information-icon.png diff --git a/User Manual/AAux/Pics/OK.png b/Documentation/User Manual/AAux/Pics/OK.png similarity index 100% rename from User Manual/AAux/Pics/OK.png rename to Documentation/User Manual/AAux/Pics/OK.png diff --git a/User Manual/AAux/Pics/OpenFile.PNG b/Documentation/User Manual/AAux/Pics/OpenFile.PNG similarity index 100% rename from User Manual/AAux/Pics/OpenFile.PNG rename to Documentation/User Manual/AAux/Pics/OpenFile.PNG diff --git a/User Manual/AAux/Pics/Screenshot 2016-03-11 17.35.18.png b/Documentation/User Manual/AAux/Pics/Screenshot 2016-03-11 17.35.18.png similarity index 100% rename from User Manual/AAux/Pics/Screenshot 2016-03-11 17.35.18.png rename to Documentation/User Manual/AAux/Pics/Screenshot 2016-03-11 17.35.18.png diff --git a/User Manual/AAux/Pics/SelectAA.jpg b/Documentation/User Manual/AAux/Pics/SelectAA.jpg similarity index 100% rename from User Manual/AAux/Pics/SelectAA.jpg rename to Documentation/User Manual/AAux/Pics/SelectAA.jpg diff --git a/User Manual/AAux/Pics/SelectedAA.jpg b/Documentation/User Manual/AAux/Pics/SelectedAA.jpg similarity index 100% rename from User Manual/AAux/Pics/SelectedAA.jpg rename to Documentation/User Manual/AAux/Pics/SelectedAA.jpg diff --git a/User Manual/AAux/Pics/TechnologyListDefaults.jpg b/Documentation/User Manual/AAux/Pics/TechnologyListDefaults.jpg similarity index 100% rename from User Manual/AAux/Pics/TechnologyListDefaults.jpg rename to Documentation/User Manual/AAux/Pics/TechnologyListDefaults.jpg diff --git a/User Manual/AAux/Pics/Update-icon.png b/Documentation/User Manual/AAux/Pics/Update-icon.png similarity index 100% rename from User Manual/AAux/Pics/Update-icon.png rename to Documentation/User Manual/AAux/Pics/Update-icon.png diff --git a/User Manual/AAux/Pics/browse.png b/Documentation/User Manual/AAux/Pics/browse.png similarity index 100% rename from User Manual/AAux/Pics/browse.png rename to Documentation/User Manual/AAux/Pics/browse.png diff --git a/User Manual/AAux/Pics/cancel.png b/Documentation/User Manual/AAux/Pics/cancel.png similarity index 100% rename from User Manual/AAux/Pics/cancel.png rename to Documentation/User Manual/AAux/Pics/cancel.png diff --git a/User Manual/AAux/Pics/checkbox.png b/Documentation/User Manual/AAux/Pics/checkbox.png similarity index 100% rename from User Manual/AAux/Pics/checkbox.png rename to Documentation/User Manual/AAux/Pics/checkbox.png diff --git a/User Manual/AAux/Pics/save.png b/Documentation/User Manual/AAux/Pics/save.png similarity index 100% rename from User Manual/AAux/Pics/save.png rename to Documentation/User Manual/AAux/Pics/save.png diff --git a/User Manual/GUI/VECTO-Editor_files/image001.jpg b/Documentation/User Manual/GUI/VECTO-Editor_files/image001.jpg similarity index 100% rename from User Manual/GUI/VECTO-Editor_files/image001.jpg rename to Documentation/User Manual/GUI/VECTO-Editor_files/image001.jpg diff --git a/User Manual/GUI/VECTO-Editor_files/image002.jpg b/Documentation/User Manual/GUI/VECTO-Editor_files/image002.jpg similarity index 100% rename from User Manual/GUI/VECTO-Editor_files/image002.jpg rename to Documentation/User Manual/GUI/VECTO-Editor_files/image002.jpg diff --git a/User Manual/GUI/VECTO-Editor_files/image003.gif b/Documentation/User Manual/GUI/VECTO-Editor_files/image003.gif similarity index 100% rename from User Manual/GUI/VECTO-Editor_files/image003.gif rename to Documentation/User Manual/GUI/VECTO-Editor_files/image003.gif diff --git a/User Manual/GUI/VECTO-Editor_files/image004.gif b/Documentation/User Manual/GUI/VECTO-Editor_files/image004.gif similarity index 100% rename from User Manual/GUI/VECTO-Editor_files/image004.gif rename to Documentation/User Manual/GUI/VECTO-Editor_files/image004.gif diff --git a/User Manual/GUI/pics/Information-icon.png b/Documentation/User Manual/GUI/pics/Information-icon.png similarity index 100% rename from User Manual/GUI/pics/Information-icon.png rename to Documentation/User Manual/GUI/pics/Information-icon.png diff --git a/User Manual/GUI/pics/OpenFile.PNG b/Documentation/User Manual/GUI/pics/OpenFile.PNG similarity index 100% rename from User Manual/GUI/pics/OpenFile.PNG rename to Documentation/User Manual/GUI/pics/OpenFile.PNG diff --git a/User Manual/GUI/pics/SelectAA.jpg b/Documentation/User Manual/GUI/pics/SelectAA.jpg similarity index 100% rename from User Manual/GUI/pics/SelectAA.jpg rename to Documentation/User Manual/GUI/pics/SelectAA.jpg diff --git a/User Manual/GUI/pics/SelectedAA.jpg b/Documentation/User Manual/GUI/pics/SelectedAA.jpg similarity index 100% rename from User Manual/GUI/pics/SelectedAA.jpg rename to Documentation/User Manual/GUI/pics/SelectedAA.jpg diff --git a/User Manual/Makefile b/Documentation/User Manual/Makefile similarity index 100% rename from User Manual/Makefile rename to Documentation/User Manual/Makefile diff --git a/User Manual/README.txt b/Documentation/User Manual/README.txt similarity index 100% rename from User Manual/README.txt rename to Documentation/User Manual/README.txt diff --git a/User Manual/Release Notes.pdf b/Documentation/User Manual/Release Notes.pdf similarity index 100% rename from User Manual/Release Notes.pdf rename to Documentation/User Manual/Release Notes.pdf diff --git a/User Manual/UserManual.sublime-project b/Documentation/User Manual/UserManual.sublime-project similarity index 100% rename from User Manual/UserManual.sublime-project rename to Documentation/User Manual/UserManual.sublime-project diff --git a/User Manual/UserManual.sublime-workspace b/Documentation/User Manual/UserManual.sublime-workspace similarity index 100% rename from User Manual/UserManual.sublime-workspace rename to Documentation/User Manual/UserManual.sublime-workspace diff --git a/User Manual/convert.bat b/Documentation/User Manual/convert.bat similarity index 100% rename from User Manual/convert.bat rename to Documentation/User Manual/convert.bat diff --git a/User Manual/files.txt b/Documentation/User Manual/files.txt similarity index 100% rename from User Manual/files.txt rename to Documentation/User Manual/files.txt diff --git a/User Manual/help.html b/Documentation/User Manual/help.html similarity index 100% rename from User Manual/help.html rename to Documentation/User Manual/help.html diff --git a/User Manual/includes/footer.html b/Documentation/User Manual/includes/footer.html similarity index 100% rename from User Manual/includes/footer.html rename to Documentation/User Manual/includes/footer.html diff --git a/User Manual/includes/header.html b/Documentation/User Manual/includes/header.html similarity index 100% rename from User Manual/includes/header.html rename to Documentation/User Manual/includes/header.html diff --git a/User Manual/includes/include.js b/Documentation/User Manual/includes/include.js similarity index 100% rename from User Manual/includes/include.js rename to Documentation/User Manual/includes/include.js diff --git a/User Manual/includes/jquery-1.11.3.min.js b/Documentation/User Manual/includes/jquery-1.11.3.min.js similarity index 100% rename from User Manual/includes/jquery-1.11.3.min.js rename to Documentation/User Manual/includes/jquery-1.11.3.min.js diff --git a/User Manual/includes/jquery-ui-1.11.4.min.js b/Documentation/User Manual/includes/jquery-ui-1.11.4.min.js similarity index 100% rename from User Manual/includes/jquery-ui-1.11.4.min.js rename to Documentation/User Manual/includes/jquery-ui-1.11.4.min.js diff --git a/User Manual/includes/mathjax.js b/Documentation/User Manual/includes/mathjax.js similarity index 100% rename from User Manual/includes/mathjax.js rename to Documentation/User Manual/includes/mathjax.js diff --git a/User Manual/includes/print.css b/Documentation/User Manual/includes/print.css similarity index 100% rename from User Manual/includes/print.css rename to Documentation/User Manual/includes/print.css diff --git a/User Manual/includes/style.css b/Documentation/User Manual/includes/style.css similarity index 100% rename from User Manual/includes/style.css rename to Documentation/User Manual/includes/style.css diff --git a/User Manual/pics/AccLimit.png b/Documentation/User Manual/pics/AccLimit.png similarity index 100% rename from User Manual/pics/AccLimit.png rename to Documentation/User Manual/pics/AccLimit.png diff --git a/User Manual/pics/Actions-arrow-down-icon.png b/Documentation/User Manual/pics/Actions-arrow-down-icon.png similarity index 100% rename from User Manual/pics/Actions-arrow-down-icon.png rename to Documentation/User Manual/pics/Actions-arrow-down-icon.png diff --git a/User Manual/pics/Actions-arrow-up-icon.png b/Documentation/User Manual/pics/Actions-arrow-up-icon.png similarity index 100% rename from User Manual/pics/Actions-arrow-up-icon.png rename to Documentation/User Manual/pics/Actions-arrow-up-icon.png diff --git a/User Manual/pics/Actions-document-save-as-icon.png b/Documentation/User Manual/pics/Actions-document-save-as-icon.png similarity index 100% rename from User Manual/pics/Actions-document-save-as-icon.png rename to Documentation/User Manual/pics/Actions-document-save-as-icon.png diff --git a/User Manual/pics/Actions-document-save-icon.png b/Documentation/User Manual/pics/Actions-document-save-icon.png similarity index 100% rename from User Manual/pics/Actions-document-save-icon.png rename to Documentation/User Manual/pics/Actions-document-save-icon.png diff --git a/User Manual/pics/Actions-go-next-icon.png b/Documentation/User Manual/pics/Actions-go-next-icon.png similarity index 100% rename from User Manual/pics/Actions-go-next-icon.png rename to Documentation/User Manual/pics/Actions-go-next-icon.png diff --git a/User Manual/pics/Actions-go-previous-icon.png b/Documentation/User Manual/pics/Actions-go-previous-icon.png similarity index 100% rename from User Manual/pics/Actions-go-previous-icon.png rename to Documentation/User Manual/pics/Actions-go-previous-icon.png diff --git a/User Manual/pics/AuxModel.png b/Documentation/User Manual/pics/AuxModel.png similarity index 100% rename from User Manual/pics/AuxModel.png rename to Documentation/User Manual/pics/AuxModel.png diff --git a/User Manual/pics/AuxModel.svg b/Documentation/User Manual/pics/AuxModel.svg similarity index 100% rename from User Manual/pics/AuxModel.svg rename to Documentation/User Manual/pics/AuxModel.svg diff --git a/User Manual/pics/Cancel.png b/Documentation/User Manual/pics/Cancel.png similarity index 100% rename from User Manual/pics/Cancel.png rename to Documentation/User Manual/pics/Cancel.png diff --git a/User Manual/pics/ENG-Editor.PNG b/Documentation/User Manual/pics/ENG-Editor.PNG similarity index 100% rename from User Manual/pics/ENG-Editor.PNG rename to Documentation/User Manual/pics/ENG-Editor.PNG diff --git a/User Manual/pics/ENG-Editor.svg b/Documentation/User Manual/pics/ENG-Editor.svg similarity index 100% rename from User Manual/pics/ENG-Editor.svg rename to Documentation/User Manual/pics/ENG-Editor.svg diff --git a/User Manual/pics/ENG-PT1.png b/Documentation/User Manual/pics/ENG-PT1.png similarity index 100% rename from User Manual/pics/ENG-PT1.png rename to Documentation/User Manual/pics/ENG-PT1.png diff --git a/User Manual/pics/Eco-Roll.png b/Documentation/User Manual/pics/Eco-Roll.png similarity index 100% rename from User Manual/pics/Eco-Roll.png rename to Documentation/User Manual/pics/Eco-Roll.png diff --git a/User Manual/pics/Eco-Roll.svg b/Documentation/User Manual/pics/Eco-Roll.svg similarity index 100% rename from User Manual/pics/Eco-Roll.svg rename to Documentation/User Manual/pics/Eco-Roll.svg diff --git a/User Manual/pics/EcoRoll.png b/Documentation/User Manual/pics/EcoRoll.png similarity index 100% rename from User Manual/pics/EcoRoll.png rename to Documentation/User Manual/pics/EcoRoll.png diff --git a/User Manual/pics/EcoRoll.svg b/Documentation/User Manual/pics/EcoRoll.svg similarity index 100% rename from User Manual/pics/EcoRoll.svg rename to Documentation/User Manual/pics/EcoRoll.svg diff --git a/User Manual/pics/Eng.png b/Documentation/User Manual/pics/Eng.png similarity index 100% rename from User Manual/pics/Eng.png rename to Documentation/User Manual/pics/Eng.png diff --git a/User Manual/pics/FCmap.png b/Documentation/User Manual/pics/FCmap.png similarity index 100% rename from User Manual/pics/FCmap.png rename to Documentation/User Manual/pics/FCmap.png diff --git a/User Manual/pics/GBX-Editor-shift1.PNG b/Documentation/User Manual/pics/GBX-Editor-shift1.PNG similarity index 100% rename from User Manual/pics/GBX-Editor-shift1.PNG rename to Documentation/User Manual/pics/GBX-Editor-shift1.PNG diff --git a/User Manual/pics/GBX-Editor-shift1.svg b/Documentation/User Manual/pics/GBX-Editor-shift1.svg similarity index 100% rename from User Manual/pics/GBX-Editor-shift1.svg rename to Documentation/User Manual/pics/GBX-Editor-shift1.svg diff --git a/User Manual/pics/GBX-Editor-shift2.PNG b/Documentation/User Manual/pics/GBX-Editor-shift2.PNG similarity index 100% rename from User Manual/pics/GBX-Editor-shift2.PNG rename to Documentation/User Manual/pics/GBX-Editor-shift2.PNG diff --git a/User Manual/pics/GBX-Editor-shift2.svg b/Documentation/User Manual/pics/GBX-Editor-shift2.svg similarity index 100% rename from User Manual/pics/GBX-Editor-shift2.svg rename to Documentation/User Manual/pics/GBX-Editor-shift2.svg diff --git a/User Manual/pics/GBX-Editor-shift3.PNG b/Documentation/User Manual/pics/GBX-Editor-shift3.PNG similarity index 100% rename from User Manual/pics/GBX-Editor-shift3.PNG rename to Documentation/User Manual/pics/GBX-Editor-shift3.PNG diff --git a/User Manual/pics/GBX-Editor-shift3.svg b/Documentation/User Manual/pics/GBX-Editor-shift3.svg similarity index 100% rename from User Manual/pics/GBX-Editor-shift3.svg rename to Documentation/User Manual/pics/GBX-Editor-shift3.svg diff --git a/User Manual/pics/GBX-Editor.PNG b/Documentation/User Manual/pics/GBX-Editor.PNG similarity index 100% rename from User Manual/pics/GBX-Editor.PNG rename to Documentation/User Manual/pics/GBX-Editor.PNG diff --git a/User Manual/pics/GBX-Editor.svg b/Documentation/User Manual/pics/GBX-Editor.svg similarity index 100% rename from User Manual/pics/GBX-Editor.svg rename to Documentation/User Manual/pics/GBX-Editor.svg diff --git a/User Manual/pics/GBX-Editor_Tout.PNG b/Documentation/User Manual/pics/GBX-Editor_Tout.PNG similarity index 100% rename from User Manual/pics/GBX-Editor_Tout.PNG rename to Documentation/User Manual/pics/GBX-Editor_Tout.PNG diff --git a/User Manual/pics/GBX-Editor_Tout.svg b/Documentation/User Manual/pics/GBX-Editor_Tout.svg similarity index 100% rename from User Manual/pics/GBX-Editor_Tout.svg rename to Documentation/User Manual/pics/GBX-Editor_Tout.svg diff --git a/User Manual/pics/GBX-TC-Setup-1-1.png b/Documentation/User Manual/pics/GBX-TC-Setup-1-1.png similarity index 100% rename from User Manual/pics/GBX-TC-Setup-1-1.png rename to Documentation/User Manual/pics/GBX-TC-Setup-1-1.png diff --git a/User Manual/pics/GBX-TC-Setup-1-1.svg b/Documentation/User Manual/pics/GBX-TC-Setup-1-1.svg similarity index 100% rename from User Manual/pics/GBX-TC-Setup-1-1.svg rename to Documentation/User Manual/pics/GBX-TC-Setup-1-1.svg diff --git a/User Manual/pics/GBX-TC-Setup-1-2.png b/Documentation/User Manual/pics/GBX-TC-Setup-1-2.png similarity index 100% rename from User Manual/pics/GBX-TC-Setup-1-2.png rename to Documentation/User Manual/pics/GBX-TC-Setup-1-2.png diff --git a/User Manual/pics/GBX-TC-Setup-1-2.svg b/Documentation/User Manual/pics/GBX-TC-Setup-1-2.svg similarity index 100% rename from User Manual/pics/GBX-TC-Setup-1-2.svg rename to Documentation/User Manual/pics/GBX-TC-Setup-1-2.svg diff --git a/User Manual/pics/GBX-TC-Setup-2-1.png b/Documentation/User Manual/pics/GBX-TC-Setup-2-1.png similarity index 100% rename from User Manual/pics/GBX-TC-Setup-2-1.png rename to Documentation/User Manual/pics/GBX-TC-Setup-2-1.png diff --git a/User Manual/pics/GBX-TC-Setup-2-1.svg b/Documentation/User Manual/pics/GBX-TC-Setup-2-1.svg similarity index 100% rename from User Manual/pics/GBX-TC-Setup-2-1.svg rename to Documentation/User Manual/pics/GBX-TC-Setup-2-1.svg diff --git a/User Manual/pics/GBX-TC-Setup-2-2.png b/Documentation/User Manual/pics/GBX-TC-Setup-2-2.png similarity index 100% rename from User Manual/pics/GBX-TC-Setup-2-2.png rename to Documentation/User Manual/pics/GBX-TC-Setup-2-2.png diff --git a/User Manual/pics/GBX-TC-Setup-2-2.svg b/Documentation/User Manual/pics/GBX-TC-Setup-2-2.svg similarity index 100% rename from User Manual/pics/GBX-TC-Setup-2-2.svg rename to Documentation/User Manual/pics/GBX-TC-Setup-2-2.svg diff --git a/User Manual/pics/GBX-TC.png b/Documentation/User Manual/pics/GBX-TC.png similarity index 100% rename from User Manual/pics/GBX-TC.png rename to Documentation/User Manual/pics/GBX-TC.png diff --git a/User Manual/pics/GBX-TC.svg b/Documentation/User Manual/pics/GBX-TC.svg similarity index 100% rename from User Manual/pics/GBX-TC.svg rename to Documentation/User Manual/pics/GBX-TC.svg diff --git a/User Manual/pics/GBX-TC2.png b/Documentation/User Manual/pics/GBX-TC2.png similarity index 100% rename from User Manual/pics/GBX-TC2.png rename to Documentation/User Manual/pics/GBX-TC2.png diff --git a/User Manual/pics/GBX-TC2.svg b/Documentation/User Manual/pics/GBX-TC2.svg similarity index 100% rename from User Manual/pics/GBX-TC2.svg rename to Documentation/User Manual/pics/GBX-TC2.svg diff --git a/User Manual/pics/Gbx.png b/Documentation/User Manual/pics/Gbx.png similarity index 100% rename from User Manual/pics/Gbx.png rename to Documentation/User Manual/pics/Gbx.png diff --git a/User Manual/pics/Graph.png b/Documentation/User Manual/pics/Graph.png similarity index 100% rename from User Manual/pics/Graph.png rename to Documentation/User Manual/pics/Graph.png diff --git a/User Manual/pics/Graph.svg b/Documentation/User Manual/pics/Graph.svg similarity index 100% rename from User Manual/pics/Graph.svg rename to Documentation/User Manual/pics/Graph.svg diff --git a/User Manual/pics/Help-icon.png b/Documentation/User Manual/pics/Help-icon.png similarity index 100% rename from User Manual/pics/Help-icon.png rename to Documentation/User Manual/pics/Help-icon.png diff --git a/User Manual/pics/IVT.png b/Documentation/User Manual/pics/IVT.png similarity index 100% rename from User Manual/pics/IVT.png rename to Documentation/User Manual/pics/IVT.png diff --git a/User Manual/pics/Information-icon.png b/Documentation/User Manual/pics/Information-icon.png similarity index 100% rename from User Manual/pics/Information-icon.png rename to Documentation/User Manual/pics/Information-icon.png diff --git a/User Manual/pics/JRC.png b/Documentation/User Manual/pics/JRC.png similarity index 100% rename from User Manual/pics/JRC.png rename to Documentation/User Manual/pics/JRC.png diff --git a/User Manual/pics/LAC.png b/Documentation/User Manual/pics/LAC.png similarity index 100% rename from User Manual/pics/LAC.png rename to Documentation/User Manual/pics/LAC.png diff --git a/User Manual/pics/LAC.svg b/Documentation/User Manual/pics/LAC.svg similarity index 100% rename from User Manual/pics/LAC.svg rename to Documentation/User Manual/pics/LAC.svg diff --git a/User Manual/pics/Look-Ahead.png b/Documentation/User Manual/pics/Look-Ahead.png similarity index 100% rename from User Manual/pics/Look-Ahead.png rename to Documentation/User Manual/pics/Look-Ahead.png diff --git a/User Manual/pics/Look-Ahead.svg b/Documentation/User Manual/pics/Look-Ahead.svg similarity index 100% rename from User Manual/pics/Look-Ahead.svg rename to Documentation/User Manual/pics/Look-Ahead.svg diff --git a/User Manual/pics/Misc-Tools-icon.png b/Documentation/User Manual/pics/Misc-Tools-icon.png similarity index 100% rename from User Manual/pics/Misc-Tools-icon.png rename to Documentation/User Manual/pics/Misc-Tools-icon.png diff --git a/User Manual/pics/OK.png b/Documentation/User Manual/pics/OK.png similarity index 100% rename from User Manual/pics/OK.png rename to Documentation/User Manual/pics/OK.png diff --git a/User Manual/pics/Open-icon.png b/Documentation/User Manual/pics/Open-icon.png similarity index 100% rename from User Manual/pics/Open-icon.png rename to Documentation/User Manual/pics/Open-icon.png diff --git a/User Manual/pics/OpenFile.PNG b/Documentation/User Manual/pics/OpenFile.PNG similarity index 100% rename from User Manual/pics/OpenFile.PNG rename to Documentation/User Manual/pics/OpenFile.PNG diff --git a/User Manual/pics/Overspeed.png b/Documentation/User Manual/pics/Overspeed.png similarity index 100% rename from User Manual/pics/Overspeed.png rename to Documentation/User Manual/pics/Overspeed.png diff --git a/User Manual/pics/Overspeed.svg b/Documentation/User Manual/pics/Overspeed.svg similarity index 100% rename from User Manual/pics/Overspeed.svg rename to Documentation/User Manual/pics/Overspeed.svg diff --git a/User Manual/pics/Play-icon.png b/Documentation/User Manual/pics/Play-icon.png similarity index 100% rename from User Manual/pics/Play-icon.png rename to Documentation/User Manual/pics/Play-icon.png diff --git a/User Manual/pics/PwheelInput.png b/Documentation/User Manual/pics/PwheelInput.png similarity index 100% rename from User Manual/pics/PwheelInput.png rename to Documentation/User Manual/pics/PwheelInput.png diff --git a/User Manual/pics/Refresh-icon.png b/Documentation/User Manual/pics/Refresh-icon.png similarity index 100% rename from User Manual/pics/Refresh-icon.png rename to Documentation/User Manual/pics/Refresh-icon.png diff --git a/User Manual/pics/Ricardo-AEA.jpg b/Documentation/User Manual/pics/Ricardo-AEA.jpg similarity index 100% rename from User Manual/pics/Ricardo-AEA.jpg rename to Documentation/User Manual/pics/Ricardo-AEA.jpg diff --git a/User Manual/pics/Ricardo.jpg b/Documentation/User Manual/pics/Ricardo.jpg similarity index 100% rename from User Manual/pics/Ricardo.jpg rename to Documentation/User Manual/pics/Ricardo.jpg diff --git a/User Manual/pics/Settings.PNG b/Documentation/User Manual/pics/Settings.PNG similarity index 100% rename from User Manual/pics/Settings.PNG rename to Documentation/User Manual/pics/Settings.PNG diff --git a/User Manual/pics/Settings.svg b/Documentation/User Manual/pics/Settings.svg similarity index 100% rename from User Manual/pics/Settings.svg rename to Documentation/User Manual/pics/Settings.svg diff --git a/User Manual/pics/Shift.png b/Documentation/User Manual/pics/Shift.png similarity index 100% rename from User Manual/pics/Shift.png rename to Documentation/User Manual/pics/Shift.png diff --git a/User Manual/pics/Shift.svg b/Documentation/User Manual/pics/Shift.svg similarity index 100% rename from User Manual/pics/Shift.svg rename to Documentation/User Manual/pics/Shift.svg diff --git a/User Manual/pics/StartStopCorrection.png b/Documentation/User Manual/pics/StartStopCorrection.png similarity index 100% rename from User Manual/pics/StartStopCorrection.png rename to Documentation/User Manual/pics/StartStopCorrection.png diff --git a/User Manual/pics/StartStopCorrection.svg b/Documentation/User Manual/pics/StartStopCorrection.svg similarity index 100% rename from User Manual/pics/StartStopCorrection.svg rename to Documentation/User Manual/pics/StartStopCorrection.svg diff --git a/User Manual/pics/TUG.png b/Documentation/User Manual/pics/TUG.png similarity index 100% rename from User Manual/pics/TUG.png rename to Documentation/User Manual/pics/TUG.png diff --git a/User Manual/pics/TUG.svg b/Documentation/User Manual/pics/TUG.svg similarity index 100% rename from User Manual/pics/TUG.svg rename to Documentation/User Manual/pics/TUG.svg diff --git a/User Manual/pics/VCDB.png b/Documentation/User Manual/pics/VCDB.png similarity index 100% rename from User Manual/pics/VCDB.png rename to Documentation/User Manual/pics/VCDB.png diff --git a/User Manual/pics/VCDV.png b/Documentation/User Manual/pics/VCDV.png similarity index 100% rename from User Manual/pics/VCDV.png rename to Documentation/User Manual/pics/VCDV.png diff --git a/User Manual/pics/VDRI01.png b/Documentation/User Manual/pics/VDRI01.png similarity index 100% rename from User Manual/pics/VDRI01.png rename to Documentation/User Manual/pics/VDRI01.png diff --git a/User Manual/pics/VDRI02.png b/Documentation/User Manual/pics/VDRI02.png similarity index 100% rename from User Manual/pics/VDRI02.png rename to Documentation/User Manual/pics/VDRI02.png diff --git a/User Manual/pics/VECTO-Editor.PNG b/Documentation/User Manual/pics/VECTO-Editor.PNG similarity index 100% rename from User Manual/pics/VECTO-Editor.PNG rename to Documentation/User Manual/pics/VECTO-Editor.PNG diff --git a/User Manual/pics/VECTO-Editor.svg b/Documentation/User Manual/pics/VECTO-Editor.svg similarity index 100% rename from User Manual/pics/VECTO-Editor.svg rename to Documentation/User Manual/pics/VECTO-Editor.svg diff --git a/User Manual/pics/VECTO-Editor_Aux.PNG b/Documentation/User Manual/pics/VECTO-Editor_Aux.PNG similarity index 100% rename from User Manual/pics/VECTO-Editor_Aux.PNG rename to Documentation/User Manual/pics/VECTO-Editor_Aux.PNG diff --git a/User Manual/pics/VECTO-Editor_Aux1.PNG b/Documentation/User Manual/pics/VECTO-Editor_Aux1.PNG similarity index 100% rename from User Manual/pics/VECTO-Editor_Aux1.PNG rename to Documentation/User Manual/pics/VECTO-Editor_Aux1.PNG diff --git a/User Manual/pics/VECTO-Editor_Aux1.svg b/Documentation/User Manual/pics/VECTO-Editor_Aux1.svg similarity index 100% rename from User Manual/pics/VECTO-Editor_Aux1.svg rename to Documentation/User Manual/pics/VECTO-Editor_Aux1.svg diff --git a/User Manual/pics/VECTO-Editor_Driver.PNG b/Documentation/User Manual/pics/VECTO-Editor_Driver.PNG similarity index 100% rename from User Manual/pics/VECTO-Editor_Driver.PNG rename to Documentation/User Manual/pics/VECTO-Editor_Driver.PNG diff --git a/User Manual/pics/VECTO-EngOnlyCycle.PNG b/Documentation/User Manual/pics/VECTO-EngOnlyCycle.PNG similarity index 100% rename from User Manual/pics/VECTO-EngOnlyCycle.PNG rename to Documentation/User Manual/pics/VECTO-EngOnlyCycle.PNG diff --git a/User Manual/pics/VECTO-EngOnlyCycle.svg b/Documentation/User Manual/pics/VECTO-EngOnlyCycle.svg similarity index 100% rename from User Manual/pics/VECTO-EngOnlyCycle.svg rename to Documentation/User Manual/pics/VECTO-EngOnlyCycle.svg diff --git a/User Manual/pics/VECTO-small.PNG b/Documentation/User Manual/pics/VECTO-small.PNG similarity index 100% rename from User Manual/pics/VECTO-small.PNG rename to Documentation/User Manual/pics/VECTO-small.PNG diff --git a/User Manual/pics/VECTOlarge.png b/Documentation/User Manual/pics/VECTOlarge.png similarity index 100% rename from User Manual/pics/VECTOlarge.png rename to Documentation/User Manual/pics/VECTOlarge.png diff --git a/User Manual/pics/VEH-Editor.PNG b/Documentation/User Manual/pics/VEH-Editor.PNG similarity index 100% rename from User Manual/pics/VEH-Editor.PNG rename to Documentation/User Manual/pics/VEH-Editor.PNG diff --git a/User Manual/pics/VEH-Editor.svg b/Documentation/User Manual/pics/VEH-Editor.svg similarity index 100% rename from User Manual/pics/VEH-Editor.svg rename to Documentation/User Manual/pics/VEH-Editor.svg diff --git a/User Manual/pics/VEH-RRC_formula.png b/Documentation/User Manual/pics/VEH-RRC_formula.png similarity index 100% rename from User Manual/pics/VEH-RRC_formula.png rename to Documentation/User Manual/pics/VEH-RRC_formula.png diff --git a/User Manual/pics/VEH-RRC_formula.svg b/Documentation/User Manual/pics/VEH-RRC_formula.svg similarity index 100% rename from User Manual/pics/VEH-RRC_formula.svg rename to Documentation/User Manual/pics/VEH-RRC_formula.svg diff --git a/User Manual/pics/Veh.png b/Documentation/User Manual/pics/Veh.png similarity index 100% rename from User Manual/pics/Veh.png rename to Documentation/User Manual/pics/Veh.png diff --git a/User Manual/pics/WHTC_Corr.PNG b/Documentation/User Manual/pics/WHTC_Corr.PNG similarity index 100% rename from User Manual/pics/WHTC_Corr.PNG rename to Documentation/User Manual/pics/WHTC_Corr.PNG diff --git a/User Manual/pics/WHTC_Corr.svg b/Documentation/User Manual/pics/WHTC_Corr.svg similarity index 100% rename from User Manual/pics/WHTC_Corr.svg rename to Documentation/User Manual/pics/WHTC_Corr.svg diff --git a/User Manual/pics/application-add-icon.png b/Documentation/User Manual/pics/application-add-icon.png similarity index 100% rename from User Manual/pics/application-add-icon.png rename to Documentation/User Manual/pics/application-add-icon.png diff --git a/User Manual/pics/blue-document-icon.png b/Documentation/User Manual/pics/blue-document-icon.png similarity index 100% rename from User Manual/pics/blue-document-icon.png rename to Documentation/User Manual/pics/blue-document-icon.png diff --git a/User Manual/pics/browse.png b/Documentation/User Manual/pics/browse.png similarity index 100% rename from User Manual/pics/browse.png rename to Documentation/User Manual/pics/browse.png diff --git a/User Manual/pics/checkbox.png b/Documentation/User Manual/pics/checkbox.png similarity index 100% rename from User Manual/pics/checkbox.png rename to Documentation/User Manual/pics/checkbox.png diff --git a/User Manual/pics/cmd.png b/Documentation/User Manual/pics/cmd.png similarity index 100% rename from User Manual/pics/cmd.png rename to Documentation/User Manual/pics/cmd.png diff --git a/User Manual/pics/cmd3.png b/Documentation/User Manual/pics/cmd3.png similarity index 100% rename from User Manual/pics/cmd3.png rename to Documentation/User Manual/pics/cmd3.png diff --git a/User Manual/pics/export-icon.png b/Documentation/User Manual/pics/export-icon.png similarity index 100% rename from User Manual/pics/export-icon.png rename to Documentation/User Manual/pics/export-icon.png diff --git a/User Manual/pics/external-icon 12x12.png b/Documentation/User Manual/pics/external-icon 12x12.png similarity index 100% rename from User Manual/pics/external-icon 12x12.png rename to Documentation/User Manual/pics/external-icon 12x12.png diff --git a/User Manual/pics/mainform.PNG b/Documentation/User Manual/pics/mainform.PNG similarity index 100% rename from User Manual/pics/mainform.PNG rename to Documentation/User Manual/pics/mainform.PNG diff --git a/User Manual/pics/mainform.svg b/Documentation/User Manual/pics/mainform.svg similarity index 100% rename from User Manual/pics/mainform.svg rename to Documentation/User Manual/pics/mainform.svg diff --git a/User Manual/pics/mainformbatch.png b/Documentation/User Manual/pics/mainformbatch.png similarity index 100% rename from User Manual/pics/mainformbatch.png rename to Documentation/User Manual/pics/mainformbatch.png diff --git a/User Manual/pics/mainformoptions.png b/Documentation/User Manual/pics/mainformoptions.png similarity index 100% rename from User Manual/pics/mainformoptions.png rename to Documentation/User Manual/pics/mainformoptions.png diff --git a/User Manual/pics/minus-circle-icon.png b/Documentation/User Manual/pics/minus-circle-icon.png similarity index 100% rename from User Manual/pics/minus-circle-icon.png rename to Documentation/User Manual/pics/minus-circle-icon.png diff --git a/User Manual/pics/plus-circle-icon.png b/Documentation/User Manual/pics/plus-circle-icon.png similarity index 100% rename from User Manual/pics/plus-circle-icon.png rename to Documentation/User Manual/pics/plus-circle-icon.png diff --git a/VectoCoreArchitecture/Components.componentdiagram b/Documentation/VectoCoreArchitecture/Components.componentdiagram similarity index 100% rename from VectoCoreArchitecture/Components.componentdiagram rename to Documentation/VectoCoreArchitecture/Components.componentdiagram diff --git a/VectoCoreArchitecture/Components.componentdiagram.layout b/Documentation/VectoCoreArchitecture/Components.componentdiagram.layout similarity index 100% rename from VectoCoreArchitecture/Components.componentdiagram.layout rename to Documentation/VectoCoreArchitecture/Components.componentdiagram.layout diff --git a/VectoCoreArchitecture/FileInputAndPowertrainCreation.classdiagram b/Documentation/VectoCoreArchitecture/FileInputAndPowertrainCreation.classdiagram similarity index 100% rename from VectoCoreArchitecture/FileInputAndPowertrainCreation.classdiagram rename to Documentation/VectoCoreArchitecture/FileInputAndPowertrainCreation.classdiagram diff --git a/VectoCoreArchitecture/FileInputAndPowertrainCreation.classdiagram.layout b/Documentation/VectoCoreArchitecture/FileInputAndPowertrainCreation.classdiagram.layout similarity index 100% rename from VectoCoreArchitecture/FileInputAndPowertrainCreation.classdiagram.layout rename to Documentation/VectoCoreArchitecture/FileInputAndPowertrainCreation.classdiagram.layout diff --git a/VectoCoreArchitecture/ModelDefinition/Package1_0957.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package1_0957.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package1_0957.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package1_0957.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package1_1314.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package1_1314.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package1_1314.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package1_1314.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package1_1315.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package1_1315.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package1_1315.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package1_1315.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package1_1341.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package1_1341.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package1_1341.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package1_1341.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package1_1426.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package1_1426.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package1_1426.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package1_1426.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package1_1817.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package1_1817.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package1_1817.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package1_1817.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package2_1314.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package2_1314.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package2_1314.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package2_1314.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package2_1315.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package2_1315.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package2_1315.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package2_1315.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package2_1426.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package2_1426.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package2_1426.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package2_1426.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package2_1817.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package2_1817.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package2_1817.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package2_1817.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package3_1314.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package3_1314.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package3_1314.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package3_1314.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package3_1315.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package3_1315.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package3_1315.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package3_1315.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package4_1314.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package4_1314.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package4_1314.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package4_1314.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package4_1315.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package4_1315.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package4_1315.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package4_1315.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package5_1315.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package5_1315.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package5_1315.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package5_1315.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package6_1315.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package6_1315.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package6_1315.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package6_1315.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package7_1315.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package7_1315.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package7_1315.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package7_1315.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package8_1315.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package8_1315.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package8_1315.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package8_1315.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package_0957.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package_0957.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package_0957.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package_0957.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package_0958.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package_0958.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package_0958.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package_0958.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package_1006.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package_1006.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package_1006.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package_1006.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package_1314.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package_1314.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package_1314.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package_1314.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package_1315.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package_1315.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package_1315.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package_1315.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package_1317.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package_1317.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package_1317.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package_1317.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package_1318.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package_1318.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package_1318.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package_1318.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package_1320.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package_1320.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package_1320.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package_1320.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package_1341.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package_1341.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package_1341.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package_1341.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package_1426.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package_1426.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package_1426.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package_1426.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package_1505.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package_1505.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package_1505.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package_1505.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package_1506.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package_1506.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package_1506.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package_1506.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package_1647.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package_1647.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package_1647.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package_1647.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package_1817.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package_1817.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package_1817.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package_1817.uml diff --git a/VectoCoreArchitecture/ModelDefinition/Package_1827.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/Package_1827.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/Package_1827.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/Package_1827.uml diff --git a/VectoCoreArchitecture/ModelDefinition/VectoArchitecture.uml b/Documentation/VectoCoreArchitecture/ModelDefinition/VectoArchitecture.uml similarity index 100% rename from VectoCoreArchitecture/ModelDefinition/VectoArchitecture.uml rename to Documentation/VectoCoreArchitecture/ModelDefinition/VectoArchitecture.uml diff --git a/VectoCoreArchitecture/Overview.classdiagram b/Documentation/VectoCoreArchitecture/Overview.classdiagram similarity index 100% rename from VectoCoreArchitecture/Overview.classdiagram rename to Documentation/VectoCoreArchitecture/Overview.classdiagram diff --git a/VectoCoreArchitecture/Overview.classdiagram.layout b/Documentation/VectoCoreArchitecture/Overview.classdiagram.layout similarity index 100% rename from VectoCoreArchitecture/Overview.classdiagram.layout rename to Documentation/VectoCoreArchitecture/Overview.classdiagram.layout diff --git a/VectoCoreArchitecture/Request.sequencediagram b/Documentation/VectoCoreArchitecture/Request.sequencediagram similarity index 100% rename from VectoCoreArchitecture/Request.sequencediagram rename to Documentation/VectoCoreArchitecture/Request.sequencediagram diff --git a/VectoCoreArchitecture/Request.sequencediagram.layout b/Documentation/VectoCoreArchitecture/Request.sequencediagram.layout similarity index 100% rename from VectoCoreArchitecture/Request.sequencediagram.layout rename to Documentation/VectoCoreArchitecture/Request.sequencediagram.layout diff --git a/VectoCoreArchitecture/Simulation.sequencediagram b/Documentation/VectoCoreArchitecture/Simulation.sequencediagram similarity index 100% rename from VectoCoreArchitecture/Simulation.sequencediagram rename to Documentation/VectoCoreArchitecture/Simulation.sequencediagram diff --git a/VectoCoreArchitecture/Simulation.sequencediagram.layout b/Documentation/VectoCoreArchitecture/Simulation.sequencediagram.layout similarity index 100% rename from VectoCoreArchitecture/Simulation.sequencediagram.layout rename to Documentation/VectoCoreArchitecture/Simulation.sequencediagram.layout diff --git a/VectoCoreArchitecture/VectoCore.classdiagram b/Documentation/VectoCoreArchitecture/VectoCore.classdiagram similarity index 100% rename from VectoCoreArchitecture/VectoCore.classdiagram rename to Documentation/VectoCoreArchitecture/VectoCore.classdiagram diff --git a/VectoCoreArchitecture/VectoCore.classdiagram.layout b/Documentation/VectoCoreArchitecture/VectoCore.classdiagram.layout similarity index 100% rename from VectoCoreArchitecture/VectoCore.classdiagram.layout rename to Documentation/VectoCoreArchitecture/VectoCore.classdiagram.layout diff --git a/VectoCoreArchitecture/VectoCoreArchitecture.modelproj b/Documentation/VectoCoreArchitecture/VectoCoreArchitecture.modelproj similarity index 100% rename from VectoCoreArchitecture/VectoCoreArchitecture.modelproj rename to Documentation/VectoCoreArchitecture/VectoCoreArchitecture.modelproj diff --git a/VectoCoreArchitecture/VectoFiles.dgml b/Documentation/VectoCoreArchitecture/VectoFiles.dgml similarity index 100% rename from VectoCoreArchitecture/VectoFiles.dgml rename to Documentation/VectoCoreArchitecture/VectoFiles.dgml diff --git a/LicenceHeader/App.config b/Tools/LicenceHeader/App.config similarity index 100% rename from LicenceHeader/App.config rename to Tools/LicenceHeader/App.config diff --git a/LicenceHeader/LicenceHeader.csproj b/Tools/LicenceHeader/LicenceHeader.csproj similarity index 100% rename from LicenceHeader/LicenceHeader.csproj rename to Tools/LicenceHeader/LicenceHeader.csproj diff --git a/LicenceHeader/Program.cs b/Tools/LicenceHeader/Program.cs similarity index 100% rename from LicenceHeader/Program.cs rename to Tools/LicenceHeader/Program.cs diff --git a/LicenceHeader/Properties/AssemblyInfo.cs b/Tools/LicenceHeader/Properties/AssemblyInfo.cs similarity index 100% rename from LicenceHeader/Properties/AssemblyInfo.cs rename to Tools/LicenceHeader/Properties/AssemblyInfo.cs diff --git a/LicenceHeader/header.txt b/Tools/LicenceHeader/header.txt similarity index 100% rename from LicenceHeader/header.txt rename to Tools/LicenceHeader/header.txt diff --git a/AuxillaryTestHarness/App.config b/VECTOAux/AuxillaryTestHarness/App.config similarity index 100% rename from AuxillaryTestHarness/App.config rename to VECTOAux/AuxillaryTestHarness/App.config diff --git a/AuxillaryTestHarness/AuxLauncher.Designer.vb b/VECTOAux/AuxillaryTestHarness/AuxLauncher.Designer.vb similarity index 100% rename from AuxillaryTestHarness/AuxLauncher.Designer.vb rename to VECTOAux/AuxillaryTestHarness/AuxLauncher.Designer.vb diff --git a/AuxillaryTestHarness/AuxLauncher.resx b/VECTOAux/AuxillaryTestHarness/AuxLauncher.resx similarity index 100% rename from AuxillaryTestHarness/AuxLauncher.resx rename to VECTOAux/AuxillaryTestHarness/AuxLauncher.resx diff --git a/AuxillaryTestHarness/AuxLauncher.vb b/VECTOAux/AuxillaryTestHarness/AuxLauncher.vb similarity index 100% rename from AuxillaryTestHarness/AuxLauncher.vb rename to VECTOAux/AuxillaryTestHarness/AuxLauncher.vb diff --git a/AuxillaryTestHarness/AuxiliaryTestHarness.vbproj b/VECTOAux/AuxillaryTestHarness/AuxiliaryTestHarness.vbproj similarity index 100% rename from AuxillaryTestHarness/AuxiliaryTestHarness.vbproj rename to VECTOAux/AuxillaryTestHarness/AuxiliaryTestHarness.vbproj diff --git a/AuxillaryTestHarness/AuxillaryTestHarness_TemporaryKey.pfx b/VECTOAux/AuxillaryTestHarness/AuxillaryTestHarness_TemporaryKey.pfx similarity index 100% rename from AuxillaryTestHarness/AuxillaryTestHarness_TemporaryKey.pfx rename to VECTOAux/AuxillaryTestHarness/AuxillaryTestHarness_TemporaryKey.pfx diff --git a/AuxillaryTestHarness/Dashboard.Designer.vb b/VECTOAux/AuxillaryTestHarness/Dashboard.Designer.vb similarity index 100% rename from AuxillaryTestHarness/Dashboard.Designer.vb rename to VECTOAux/AuxillaryTestHarness/Dashboard.Designer.vb diff --git a/AuxillaryTestHarness/Dashboard.resx b/VECTOAux/AuxillaryTestHarness/Dashboard.resx similarity index 100% rename from AuxillaryTestHarness/Dashboard.resx rename to VECTOAux/AuxillaryTestHarness/Dashboard.resx diff --git a/AuxillaryTestHarness/Dashboard.vb b/VECTOAux/AuxillaryTestHarness/Dashboard.vb similarity index 100% rename from AuxillaryTestHarness/Dashboard.vb rename to VECTOAux/AuxillaryTestHarness/Dashboard.vb diff --git a/AuxillaryTestHarness/HVACSteadyStateModel.AHSM b/VECTOAux/AuxillaryTestHarness/HVACSteadyStateModel.AHSM similarity index 100% rename from AuxillaryTestHarness/HVACSteadyStateModel.AHSM rename to VECTOAux/AuxillaryTestHarness/HVACSteadyStateModel.AHSM diff --git a/AuxillaryTestHarness/Images/amberLight.jpg b/VECTOAux/AuxillaryTestHarness/Images/amberLight.jpg similarity index 100% rename from AuxillaryTestHarness/Images/amberLight.jpg rename to VECTOAux/AuxillaryTestHarness/Images/amberLight.jpg diff --git a/AuxillaryTestHarness/Images/greenLight.jpg b/VECTOAux/AuxillaryTestHarness/Images/greenLight.jpg similarity index 100% rename from AuxillaryTestHarness/Images/greenLight.jpg rename to VECTOAux/AuxillaryTestHarness/Images/greenLight.jpg diff --git a/AuxillaryTestHarness/My Project/Application.Designer.vb b/VECTOAux/AuxillaryTestHarness/My Project/Application.Designer.vb similarity index 100% rename from AuxillaryTestHarness/My Project/Application.Designer.vb rename to VECTOAux/AuxillaryTestHarness/My Project/Application.Designer.vb diff --git a/AuxillaryTestHarness/My Project/Application.myapp b/VECTOAux/AuxillaryTestHarness/My Project/Application.myapp similarity index 100% rename from AuxillaryTestHarness/My Project/Application.myapp rename to VECTOAux/AuxillaryTestHarness/My Project/Application.myapp diff --git a/AuxillaryTestHarness/My Project/AssemblyInfo.vb b/VECTOAux/AuxillaryTestHarness/My Project/AssemblyInfo.vb similarity index 100% rename from AuxillaryTestHarness/My Project/AssemblyInfo.vb rename to VECTOAux/AuxillaryTestHarness/My Project/AssemblyInfo.vb diff --git a/AuxillaryTestHarness/My Project/DataSources/Dashboard.datasource b/VECTOAux/AuxillaryTestHarness/My Project/DataSources/Dashboard.datasource similarity index 100% rename from AuxillaryTestHarness/My Project/DataSources/Dashboard.datasource rename to VECTOAux/AuxillaryTestHarness/My Project/DataSources/Dashboard.datasource diff --git a/AuxillaryTestHarness/My Project/Resources.Designer.vb b/VECTOAux/AuxillaryTestHarness/My Project/Resources.Designer.vb similarity index 100% rename from AuxillaryTestHarness/My Project/Resources.Designer.vb rename to VECTOAux/AuxillaryTestHarness/My Project/Resources.Designer.vb diff --git a/AuxillaryTestHarness/My Project/Resources.resx b/VECTOAux/AuxillaryTestHarness/My Project/Resources.resx similarity index 100% rename from AuxillaryTestHarness/My Project/Resources.resx rename to VECTOAux/AuxillaryTestHarness/My Project/Resources.resx diff --git a/AuxillaryTestHarness/My Project/Settings.Designer.vb b/VECTOAux/AuxillaryTestHarness/My Project/Settings.Designer.vb similarity index 100% rename from AuxillaryTestHarness/My Project/Settings.Designer.vb rename to VECTOAux/AuxillaryTestHarness/My Project/Settings.Designer.vb diff --git a/AuxillaryTestHarness/My Project/Settings.settings b/VECTOAux/AuxillaryTestHarness/My Project/Settings.settings similarity index 100% rename from AuxillaryTestHarness/My Project/Settings.settings rename to VECTOAux/AuxillaryTestHarness/My Project/Settings.settings diff --git a/AuxillaryTestHarness/NEWALT.AALT b/VECTOAux/AuxillaryTestHarness/NEWALT.AALT similarity index 100% rename from AuxillaryTestHarness/NEWALT.AALT rename to VECTOAux/AuxillaryTestHarness/NEWALT.AALT diff --git a/AuxillaryTestHarness/Resource1.Designer.vb b/VECTOAux/AuxillaryTestHarness/Resource1.Designer.vb similarity index 100% rename from AuxillaryTestHarness/Resource1.Designer.vb rename to VECTOAux/AuxillaryTestHarness/Resource1.Designer.vb diff --git a/AuxillaryTestHarness/Resource1.resx b/VECTOAux/AuxillaryTestHarness/Resource1.resx similarity index 100% rename from AuxillaryTestHarness/Resource1.resx rename to VECTOAux/AuxillaryTestHarness/Resource1.resx diff --git a/AuxillaryTestHarness/TAKAWAY.AHSM b/VECTOAux/AuxillaryTestHarness/TAKAWAY.AHSM similarity index 100% rename from AuxillaryTestHarness/TAKAWAY.AHSM rename to VECTOAux/AuxillaryTestHarness/TAKAWAY.AHSM diff --git a/AuxillaryTestHarness/UI/FB_Dialog.designer.vb b/VECTOAux/AuxillaryTestHarness/UI/FB_Dialog.designer.vb similarity index 100% rename from AuxillaryTestHarness/UI/FB_Dialog.designer.vb rename to VECTOAux/AuxillaryTestHarness/UI/FB_Dialog.designer.vb diff --git a/AuxillaryTestHarness/UI/FB_Dialog.resx b/VECTOAux/AuxillaryTestHarness/UI/FB_Dialog.resx similarity index 100% rename from AuxillaryTestHarness/UI/FB_Dialog.resx rename to VECTOAux/AuxillaryTestHarness/UI/FB_Dialog.resx diff --git a/AuxillaryTestHarness/UI/FB_Dialog.vb b/VECTOAux/AuxillaryTestHarness/UI/FB_Dialog.vb similarity index 100% rename from AuxillaryTestHarness/UI/FB_Dialog.vb rename to VECTOAux/AuxillaryTestHarness/UI/FB_Dialog.vb diff --git a/AuxillaryTestHarness/UI/FB_FavDlog.designer.vb b/VECTOAux/AuxillaryTestHarness/UI/FB_FavDlog.designer.vb similarity index 100% rename from AuxillaryTestHarness/UI/FB_FavDlog.designer.vb rename to VECTOAux/AuxillaryTestHarness/UI/FB_FavDlog.designer.vb diff --git a/AuxillaryTestHarness/UI/FB_FavDlog.resx b/VECTOAux/AuxillaryTestHarness/UI/FB_FavDlog.resx similarity index 100% rename from AuxillaryTestHarness/UI/FB_FavDlog.resx rename to VECTOAux/AuxillaryTestHarness/UI/FB_FavDlog.resx diff --git a/AuxillaryTestHarness/UI/FB_FavDlog.vb b/VECTOAux/AuxillaryTestHarness/UI/FB_FavDlog.vb similarity index 100% rename from AuxillaryTestHarness/UI/FB_FavDlog.vb rename to VECTOAux/AuxillaryTestHarness/UI/FB_FavDlog.vb diff --git a/AuxillaryTestHarness/UI/FB_Global.vb b/VECTOAux/AuxillaryTestHarness/UI/FB_Global.vb similarity index 100% rename from AuxillaryTestHarness/UI/FB_Global.vb rename to VECTOAux/AuxillaryTestHarness/UI/FB_Global.vb diff --git a/AuxillaryTestHarness/UI/VECTO_Types.vb b/VECTOAux/AuxillaryTestHarness/UI/VECTO_Types.vb similarity index 100% rename from AuxillaryTestHarness/UI/VECTO_Types.vb rename to VECTOAux/AuxillaryTestHarness/UI/VECTO_Types.vb diff --git a/AuxillaryTestHarness/UI/cFileBrowser.vb b/VECTOAux/AuxillaryTestHarness/UI/cFileBrowser.vb similarity index 100% rename from AuxillaryTestHarness/UI/cFileBrowser.vb rename to VECTOAux/AuxillaryTestHarness/UI/cFileBrowser.vb diff --git a/AuxillaryTestHarness/testAlternatorMap - Copy.aalt b/VECTOAux/AuxillaryTestHarness/testAlternatorMap - Copy.aalt similarity index 100% rename from AuxillaryTestHarness/testAlternatorMap - Copy.aalt rename to VECTOAux/AuxillaryTestHarness/testAlternatorMap - Copy.aalt diff --git a/AuxillaryTestHarness/testAlternatorMap.aalt b/VECTOAux/AuxillaryTestHarness/testAlternatorMap.aalt similarity index 100% rename from AuxillaryTestHarness/testAlternatorMap.aalt rename to VECTOAux/AuxillaryTestHarness/testAlternatorMap.aalt diff --git a/AuxillaryTestHarness/testCompressorMap.acmp b/VECTOAux/AuxillaryTestHarness/testCompressorMap.acmp similarity index 100% rename from AuxillaryTestHarness/testCompressorMap.acmp rename to VECTOAux/AuxillaryTestHarness/testCompressorMap.acmp diff --git a/AuxillaryTestHarness/testFuelGoodMap.vmap b/VECTOAux/AuxillaryTestHarness/testFuelGoodMap.vmap similarity index 100% rename from AuxillaryTestHarness/testFuelGoodMap.vmap rename to VECTOAux/AuxillaryTestHarness/testFuelGoodMap.vmap diff --git a/AuxillaryTestHarness/testPneumaticActuationsMap_GOODMAP.apac b/VECTOAux/AuxillaryTestHarness/testPneumaticActuationsMap_GOODMAP.apac similarity index 100% rename from AuxillaryTestHarness/testPneumaticActuationsMap_GOODMAP.apac rename to VECTOAux/AuxillaryTestHarness/testPneumaticActuationsMap_GOODMAP.apac diff --git a/HVACTOOL/ABCDEFG.aalt b/VECTOAux/HVACTOOL/ABCDEFG.aalt similarity index 100% rename from HVACTOOL/ABCDEFG.aalt rename to VECTOAux/HVACTOOL/ABCDEFG.aalt diff --git a/HVACTOOL/BusDatabase.abdb b/VECTOAux/HVACTOOL/BusDatabase.abdb similarity index 100% rename from HVACTOOL/BusDatabase.abdb rename to VECTOAux/HVACTOOL/BusDatabase.abdb diff --git a/HVACTOOL/Form1.Designer.vb b/VECTOAux/HVACTOOL/Form1.Designer.vb similarity index 100% rename from HVACTOOL/Form1.Designer.vb rename to VECTOAux/HVACTOOL/Form1.Designer.vb diff --git a/HVACTOOL/Form1.resx b/VECTOAux/HVACTOOL/Form1.resx similarity index 100% rename from HVACTOOL/Form1.resx rename to VECTOAux/HVACTOOL/Form1.resx diff --git a/HVACTOOL/Form1.vb b/VECTOAux/HVACTOOL/Form1.vb similarity index 100% rename from HVACTOOL/Form1.vb rename to VECTOAux/HVACTOOL/Form1.vb diff --git a/HVACTOOL/HVACTOOL.vbproj b/VECTOAux/HVACTOOL/HVACTOOL.vbproj similarity index 100% rename from HVACTOOL/HVACTOOL.vbproj rename to VECTOAux/HVACTOOL/HVACTOOL.vbproj diff --git a/HVACTOOL/HVACTOOL_TemporaryKey.pfx b/VECTOAux/HVACTOOL/HVACTOOL_TemporaryKey.pfx similarity index 100% rename from HVACTOOL/HVACTOOL_TemporaryKey.pfx rename to VECTOAux/HVACTOOL/HVACTOOL_TemporaryKey.pfx diff --git a/HVACTOOL/Module1.vb b/VECTOAux/HVACTOOL/Module1.vb similarity index 100% rename from HVACTOOL/Module1.vb rename to VECTOAux/HVACTOOL/Module1.vb diff --git a/HVACTOOL/My Project/Application.Designer.vb b/VECTOAux/HVACTOOL/My Project/Application.Designer.vb similarity index 100% rename from HVACTOOL/My Project/Application.Designer.vb rename to VECTOAux/HVACTOOL/My Project/Application.Designer.vb diff --git a/HVACTOOL/My Project/Application.myapp b/VECTOAux/HVACTOOL/My Project/Application.myapp similarity index 100% rename from HVACTOOL/My Project/Application.myapp rename to VECTOAux/HVACTOOL/My Project/Application.myapp diff --git a/HVACTOOL/My Project/AssemblyInfo.vb b/VECTOAux/HVACTOOL/My Project/AssemblyInfo.vb similarity index 100% rename from HVACTOOL/My Project/AssemblyInfo.vb rename to VECTOAux/HVACTOOL/My Project/AssemblyInfo.vb diff --git a/HVACTOOL/My Project/Resources.Designer.vb b/VECTOAux/HVACTOOL/My Project/Resources.Designer.vb similarity index 100% rename from HVACTOOL/My Project/Resources.Designer.vb rename to VECTOAux/HVACTOOL/My Project/Resources.Designer.vb diff --git a/HVACTOOL/My Project/Resources.resx b/VECTOAux/HVACTOOL/My Project/Resources.resx similarity index 100% rename from HVACTOOL/My Project/Resources.resx rename to VECTOAux/HVACTOOL/My Project/Resources.resx diff --git a/HVACTOOL/My Project/Settings.Designer.vb b/VECTOAux/HVACTOOL/My Project/Settings.Designer.vb similarity index 100% rename from HVACTOOL/My Project/Settings.Designer.vb rename to VECTOAux/HVACTOOL/My Project/Settings.Designer.vb diff --git a/HVACTOOL/My Project/Settings.settings b/VECTOAux/HVACTOOL/My Project/Settings.settings similarity index 100% rename from HVACTOOL/My Project/Settings.settings rename to VECTOAux/HVACTOOL/My Project/Settings.settings diff --git a/HVACTOOL/SSMOLD.ashm b/VECTOAux/HVACTOOL/SSMOLD.ashm similarity index 100% rename from HVACTOOL/SSMOLD.ashm rename to VECTOAux/HVACTOOL/SSMOLD.ashm diff --git a/HVACTOOL/SSMTechBenefitsALLON.csv b/VECTOAux/HVACTOOL/SSMTechBenefitsALLON.csv similarity index 100% rename from HVACTOOL/SSMTechBenefitsALLON.csv rename to VECTOAux/HVACTOOL/SSMTechBenefitsALLON.csv diff --git a/HVACTOOL/SSMTechBenefitsALLON_LIVE.csv b/VECTOAux/HVACTOOL/SSMTechBenefitsALLON_LIVE.csv similarity index 100% rename from HVACTOOL/SSMTechBenefitsALLON_LIVE.csv rename to VECTOAux/HVACTOOL/SSMTechBenefitsALLON_LIVE.csv diff --git a/HVACTOOL/ssm.Ahsm b/VECTOAux/HVACTOOL/ssm.Ahsm similarity index 100% rename from HVACTOOL/ssm.Ahsm rename to VECTOAux/HVACTOOL/ssm.Ahsm diff --git a/HVACTOOL/testCombinedAlternatorMap.aalt b/VECTOAux/HVACTOOL/testCombinedAlternatorMap.aalt similarity index 100% rename from HVACTOOL/testCombinedAlternatorMap.aalt rename to VECTOAux/HVACTOOL/testCombinedAlternatorMap.aalt diff --git a/HVACTOOL/testSSMTechBenefits.csv b/VECTOAux/HVACTOOL/testSSMTechBenefits.csv similarity index 100% rename from HVACTOOL/testSSMTechBenefits.csv rename to VECTOAux/HVACTOOL/testSSMTechBenefits.csv diff --git a/VectoCore/Configuration/Constants.cs b/VectoCore/VectoCore/Configuration/Constants.cs similarity index 100% rename from VectoCore/Configuration/Constants.cs rename to VectoCore/VectoCore/Configuration/Constants.cs diff --git a/VectoCore/Exceptions/VectoExceptions.cs b/VectoCore/VectoCore/Exceptions/VectoExceptions.cs similarity index 100% rename from VectoCore/Exceptions/VectoExceptions.cs rename to VectoCore/VectoCore/Exceptions/VectoExceptions.cs diff --git a/VectoCore/Exceptions/VectoSimulationException.cs b/VectoCore/VectoCore/Exceptions/VectoSimulationException.cs similarity index 100% rename from VectoCore/Exceptions/VectoSimulationException.cs rename to VectoCore/VectoCore/Exceptions/VectoSimulationException.cs diff --git a/VectoCore/InputData/DeclarationInputData.cs b/VectoCore/VectoCore/InputData/DeclarationInputData.cs similarity index 100% rename from VectoCore/InputData/DeclarationInputData.cs rename to VectoCore/VectoCore/InputData/DeclarationInputData.cs diff --git a/VectoCore/InputData/EngineeringInputData.cs b/VectoCore/VectoCore/InputData/EngineeringInputData.cs similarity index 100% rename from VectoCore/InputData/EngineeringInputData.cs rename to VectoCore/VectoCore/InputData/EngineeringInputData.cs diff --git a/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs similarity index 100% rename from VectoCore/InputData/FileIO/JSON/JSONEngineData.cs rename to VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs diff --git a/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs similarity index 100% rename from VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs rename to VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs diff --git a/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs similarity index 100% rename from VectoCore/InputData/FileIO/JSON/JSONInputData.cs rename to VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs diff --git a/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs similarity index 100% rename from VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs rename to VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs diff --git a/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs similarity index 100% rename from VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs rename to VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs diff --git a/VectoCore/InputData/FileIO/JSON/JsonExtensionMethods.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JsonExtensionMethods.cs similarity index 100% rename from VectoCore/InputData/FileIO/JSON/JsonExtensionMethods.cs rename to VectoCore/VectoCore/InputData/FileIO/JSON/JsonExtensionMethods.cs diff --git a/VectoCore/InputData/IInputDataProvider.cs b/VectoCore/VectoCore/InputData/IInputDataProvider.cs similarity index 100% rename from VectoCore/InputData/IInputDataProvider.cs rename to VectoCore/VectoCore/InputData/IInputDataProvider.cs diff --git a/VectoCore/InputData/IVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/IVectoRunDataFactory.cs similarity index 100% rename from VectoCore/InputData/IVectoRunDataFactory.cs rename to VectoCore/VectoCore/InputData/IVectoRunDataFactory.cs diff --git a/VectoCore/InputData/Impl/InputData.cs b/VectoCore/VectoCore/InputData/Impl/InputData.cs similarity index 100% rename from VectoCore/InputData/Impl/InputData.cs rename to VectoCore/VectoCore/InputData/Impl/InputData.cs diff --git a/VectoCore/InputData/IntegrityStatus.cs b/VectoCore/VectoCore/InputData/IntegrityStatus.cs similarity index 100% rename from VectoCore/InputData/IntegrityStatus.cs rename to VectoCore/VectoCore/InputData/IntegrityStatus.cs diff --git a/VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs similarity index 100% rename from VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs rename to VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs diff --git a/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs similarity index 100% rename from VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs rename to VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs diff --git a/VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs similarity index 100% rename from VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs rename to VectoCore/VectoCore/InputData/Reader/DataObjectAdaper/EngineeringDataAdapter.cs diff --git a/VectoCore/InputData/Reader/DrivingCycleDataReader.cs b/VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs similarity index 100% rename from VectoCore/InputData/Reader/DrivingCycleDataReader.cs rename to VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs diff --git a/VectoCore/InputData/Reader/Impl/AbstractVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/AbstractVectoRunDataFactory.cs similarity index 100% rename from VectoCore/InputData/Reader/Impl/AbstractVectoRunDataFactory.cs rename to VectoCore/VectoCore/InputData/Reader/Impl/AbstractVectoRunDataFactory.cs diff --git a/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs similarity index 100% rename from VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs rename to VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs diff --git a/VectoCore/InputData/Reader/Impl/EngineOnlyVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/EngineOnlyVectoRunDataFactory.cs similarity index 100% rename from VectoCore/InputData/Reader/Impl/EngineOnlyVectoRunDataFactory.cs rename to VectoCore/VectoCore/InputData/Reader/Impl/EngineOnlyVectoRunDataFactory.cs diff --git a/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs similarity index 100% rename from VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs rename to VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs diff --git a/VectoCore/JsonKeys.Designer.cs b/VectoCore/VectoCore/JsonKeys.Designer.cs similarity index 100% rename from VectoCore/JsonKeys.Designer.cs rename to VectoCore/VectoCore/JsonKeys.Designer.cs diff --git a/VectoCore/JsonKeys.resx b/VectoCore/VectoCore/JsonKeys.resx similarity index 100% rename from VectoCore/JsonKeys.resx rename to VectoCore/VectoCore/JsonKeys.resx diff --git a/VectoCore/Models/Connector/Ports/IDriverDemandPort.cs b/VectoCore/VectoCore/Models/Connector/Ports/IDriverDemandPort.cs similarity index 100% rename from VectoCore/Models/Connector/Ports/IDriverDemandPort.cs rename to VectoCore/VectoCore/Models/Connector/Ports/IDriverDemandPort.cs diff --git a/VectoCore/Models/Connector/Ports/IDrivingCyclePort.cs b/VectoCore/VectoCore/Models/Connector/Ports/IDrivingCyclePort.cs similarity index 100% rename from VectoCore/Models/Connector/Ports/IDrivingCyclePort.cs rename to VectoCore/VectoCore/Models/Connector/Ports/IDrivingCyclePort.cs diff --git a/VectoCore/Models/Connector/Ports/IFvPort.cs b/VectoCore/VectoCore/Models/Connector/Ports/IFvPort.cs similarity index 100% rename from VectoCore/Models/Connector/Ports/IFvPort.cs rename to VectoCore/VectoCore/Models/Connector/Ports/IFvPort.cs diff --git a/VectoCore/Models/Connector/Ports/IResponse.cs b/VectoCore/VectoCore/Models/Connector/Ports/IResponse.cs similarity index 100% rename from VectoCore/Models/Connector/Ports/IResponse.cs rename to VectoCore/VectoCore/Models/Connector/Ports/IResponse.cs diff --git a/VectoCore/Models/Connector/Ports/ISimulationPort.cs b/VectoCore/VectoCore/Models/Connector/Ports/ISimulationPort.cs similarity index 100% rename from VectoCore/Models/Connector/Ports/ISimulationPort.cs rename to VectoCore/VectoCore/Models/Connector/Ports/ISimulationPort.cs diff --git a/VectoCore/Models/Connector/Ports/ITnPort.cs b/VectoCore/VectoCore/Models/Connector/Ports/ITnPort.cs similarity index 100% rename from VectoCore/Models/Connector/Ports/ITnPort.cs rename to VectoCore/VectoCore/Models/Connector/Ports/ITnPort.cs diff --git a/VectoCore/Models/Connector/Ports/Impl/Response.cs b/VectoCore/VectoCore/Models/Connector/Ports/Impl/Response.cs similarity index 100% rename from VectoCore/Models/Connector/Ports/Impl/Response.cs rename to VectoCore/VectoCore/Models/Connector/Ports/Impl/Response.cs diff --git a/VectoCore/Models/Declaration/AirDrag.cs b/VectoCore/VectoCore/Models/Declaration/AirDrag.cs similarity index 100% rename from VectoCore/Models/Declaration/AirDrag.cs rename to VectoCore/VectoCore/Models/Declaration/AirDrag.cs diff --git a/VectoCore/Models/Declaration/Axle.cs b/VectoCore/VectoCore/Models/Declaration/Axle.cs similarity index 100% rename from VectoCore/Models/Declaration/Axle.cs rename to VectoCore/VectoCore/Models/Declaration/Axle.cs diff --git a/VectoCore/Models/Declaration/AxleConfiguration.cs b/VectoCore/VectoCore/Models/Declaration/AxleConfiguration.cs similarity index 100% rename from VectoCore/Models/Declaration/AxleConfiguration.cs rename to VectoCore/VectoCore/Models/Declaration/AxleConfiguration.cs diff --git a/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs similarity index 100% rename from VectoCore/Models/Declaration/DeclarationData.cs rename to VectoCore/VectoCore/Models/Declaration/DeclarationData.cs diff --git a/VectoCore/Models/Declaration/DeclarationRims.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationRims.cs similarity index 100% rename from VectoCore/Models/Declaration/DeclarationRims.cs rename to VectoCore/VectoCore/Models/Declaration/DeclarationRims.cs diff --git a/VectoCore/Models/Declaration/ElectricSystem.cs b/VectoCore/VectoCore/Models/Declaration/ElectricSystem.cs similarity index 100% rename from VectoCore/Models/Declaration/ElectricSystem.cs rename to VectoCore/VectoCore/Models/Declaration/ElectricSystem.cs diff --git a/VectoCore/Models/Declaration/Fan.cs b/VectoCore/VectoCore/Models/Declaration/Fan.cs similarity index 100% rename from VectoCore/Models/Declaration/Fan.cs rename to VectoCore/VectoCore/Models/Declaration/Fan.cs diff --git a/VectoCore/Models/Declaration/HVAC.cs b/VectoCore/VectoCore/Models/Declaration/HVAC.cs similarity index 100% rename from VectoCore/Models/Declaration/HVAC.cs rename to VectoCore/VectoCore/Models/Declaration/HVAC.cs diff --git a/VectoCore/Models/Declaration/LookupData.cs b/VectoCore/VectoCore/Models/Declaration/LookupData.cs similarity index 100% rename from VectoCore/Models/Declaration/LookupData.cs rename to VectoCore/VectoCore/Models/Declaration/LookupData.cs diff --git a/VectoCore/Models/Declaration/Mission.cs b/VectoCore/VectoCore/Models/Declaration/Mission.cs similarity index 100% rename from VectoCore/Models/Declaration/Mission.cs rename to VectoCore/VectoCore/Models/Declaration/Mission.cs diff --git a/VectoCore/Models/Declaration/MissionType.cs b/VectoCore/VectoCore/Models/Declaration/MissionType.cs similarity index 100% rename from VectoCore/Models/Declaration/MissionType.cs rename to VectoCore/VectoCore/Models/Declaration/MissionType.cs diff --git a/VectoCore/Models/Declaration/PT1.cs b/VectoCore/VectoCore/Models/Declaration/PT1.cs similarity index 100% rename from VectoCore/Models/Declaration/PT1.cs rename to VectoCore/VectoCore/Models/Declaration/PT1.cs diff --git a/VectoCore/Models/Declaration/PneumaticSystem.cs b/VectoCore/VectoCore/Models/Declaration/PneumaticSystem.cs similarity index 100% rename from VectoCore/Models/Declaration/PneumaticSystem.cs rename to VectoCore/VectoCore/Models/Declaration/PneumaticSystem.cs diff --git a/VectoCore/Models/Declaration/Rims.cs b/VectoCore/VectoCore/Models/Declaration/Rims.cs similarity index 100% rename from VectoCore/Models/Declaration/Rims.cs rename to VectoCore/VectoCore/Models/Declaration/Rims.cs diff --git a/VectoCore/Models/Declaration/Segment.cs b/VectoCore/VectoCore/Models/Declaration/Segment.cs similarity index 100% rename from VectoCore/Models/Declaration/Segment.cs rename to VectoCore/VectoCore/Models/Declaration/Segment.cs diff --git a/VectoCore/Models/Declaration/Segments.cs b/VectoCore/VectoCore/Models/Declaration/Segments.cs similarity index 100% rename from VectoCore/Models/Declaration/Segments.cs rename to VectoCore/VectoCore/Models/Declaration/Segments.cs diff --git a/VectoCore/Models/Declaration/SteeringPump.cs b/VectoCore/VectoCore/Models/Declaration/SteeringPump.cs similarity index 100% rename from VectoCore/Models/Declaration/SteeringPump.cs rename to VectoCore/VectoCore/Models/Declaration/SteeringPump.cs diff --git a/VectoCore/Models/Declaration/TorqueConverter.cs b/VectoCore/VectoCore/Models/Declaration/TorqueConverter.cs similarity index 100% rename from VectoCore/Models/Declaration/TorqueConverter.cs rename to VectoCore/VectoCore/Models/Declaration/TorqueConverter.cs diff --git a/VectoCore/Models/Declaration/VehicleCategory.cs b/VectoCore/VectoCore/Models/Declaration/VehicleCategory.cs similarity index 100% rename from VectoCore/Models/Declaration/VehicleCategory.cs rename to VectoCore/VectoCore/Models/Declaration/VehicleCategory.cs diff --git a/VectoCore/Models/Declaration/VehicleClass.cs b/VectoCore/VectoCore/Models/Declaration/VehicleClass.cs similarity index 100% rename from VectoCore/Models/Declaration/VehicleClass.cs rename to VectoCore/VectoCore/Models/Declaration/VehicleClass.cs diff --git a/VectoCore/Models/Declaration/WHTCCorrection.cs b/VectoCore/VectoCore/Models/Declaration/WHTCCorrection.cs similarity index 100% rename from VectoCore/Models/Declaration/WHTCCorrection.cs rename to VectoCore/VectoCore/Models/Declaration/WHTCCorrection.cs diff --git a/VectoCore/Models/Declaration/Wheels.cs b/VectoCore/VectoCore/Models/Declaration/Wheels.cs similarity index 100% rename from VectoCore/Models/Declaration/Wheels.cs rename to VectoCore/VectoCore/Models/Declaration/Wheels.cs diff --git a/VectoCore/Models/LoggingObject.cs b/VectoCore/VectoCore/Models/LoggingObject.cs similarity index 100% rename from VectoCore/Models/LoggingObject.cs rename to VectoCore/VectoCore/Models/LoggingObject.cs diff --git a/VectoCore/Models/Simulation/Data/AuxiliaryDemandType.cs b/VectoCore/VectoCore/Models/Simulation/Data/AuxiliaryDemandType.cs similarity index 100% rename from VectoCore/Models/Simulation/Data/AuxiliaryDemandType.cs rename to VectoCore/VectoCore/Models/Simulation/Data/AuxiliaryDemandType.cs diff --git a/VectoCore/Models/Simulation/Data/ModalResult.cs b/VectoCore/VectoCore/Models/Simulation/Data/ModalResult.cs similarity index 100% rename from VectoCore/Models/Simulation/Data/ModalResult.cs rename to VectoCore/VectoCore/Models/Simulation/Data/ModalResult.cs diff --git a/VectoCore/Models/Simulation/Data/VectoJobData.cs b/VectoCore/VectoCore/Models/Simulation/Data/VectoJobData.cs similarity index 100% rename from VectoCore/Models/Simulation/Data/VectoJobData.cs rename to VectoCore/VectoCore/Models/Simulation/Data/VectoJobData.cs diff --git a/VectoCore/Models/Simulation/Data/VectoRunData.cs b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs similarity index 100% rename from VectoCore/Models/Simulation/Data/VectoRunData.cs rename to VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs diff --git a/VectoCore/Models/Simulation/DataBus/IClutchInfo.cs b/VectoCore/VectoCore/Models/Simulation/DataBus/IClutchInfo.cs similarity index 100% rename from VectoCore/Models/Simulation/DataBus/IClutchInfo.cs rename to VectoCore/VectoCore/Models/Simulation/DataBus/IClutchInfo.cs diff --git a/VectoCore/Models/Simulation/DataBus/IDataBus.cs b/VectoCore/VectoCore/Models/Simulation/DataBus/IDataBus.cs similarity index 100% rename from VectoCore/Models/Simulation/DataBus/IDataBus.cs rename to VectoCore/VectoCore/Models/Simulation/DataBus/IDataBus.cs diff --git a/VectoCore/Models/Simulation/DataBus/IDriverInfo.cs b/VectoCore/VectoCore/Models/Simulation/DataBus/IDriverInfo.cs similarity index 100% rename from VectoCore/Models/Simulation/DataBus/IDriverInfo.cs rename to VectoCore/VectoCore/Models/Simulation/DataBus/IDriverInfo.cs diff --git a/VectoCore/Models/Simulation/DataBus/IEngineInfo.cs b/VectoCore/VectoCore/Models/Simulation/DataBus/IEngineInfo.cs similarity index 100% rename from VectoCore/Models/Simulation/DataBus/IEngineInfo.cs rename to VectoCore/VectoCore/Models/Simulation/DataBus/IEngineInfo.cs diff --git a/VectoCore/Models/Simulation/DataBus/IGearboxInfo.cs b/VectoCore/VectoCore/Models/Simulation/DataBus/IGearboxInfo.cs similarity index 100% rename from VectoCore/Models/Simulation/DataBus/IGearboxInfo.cs rename to VectoCore/VectoCore/Models/Simulation/DataBus/IGearboxInfo.cs diff --git a/VectoCore/Models/Simulation/DataBus/IMileageCounter.cs b/VectoCore/VectoCore/Models/Simulation/DataBus/IMileageCounter.cs similarity index 100% rename from VectoCore/Models/Simulation/DataBus/IMileageCounter.cs rename to VectoCore/VectoCore/Models/Simulation/DataBus/IMileageCounter.cs diff --git a/VectoCore/Models/Simulation/DataBus/IRoadLookAhead.cs b/VectoCore/VectoCore/Models/Simulation/DataBus/IRoadLookAhead.cs similarity index 100% rename from VectoCore/Models/Simulation/DataBus/IRoadLookAhead.cs rename to VectoCore/VectoCore/Models/Simulation/DataBus/IRoadLookAhead.cs diff --git a/VectoCore/Models/Simulation/DataBus/IVehicleInfo.cs b/VectoCore/VectoCore/Models/Simulation/DataBus/IVehicleInfo.cs similarity index 100% rename from VectoCore/Models/Simulation/DataBus/IVehicleInfo.cs rename to VectoCore/VectoCore/Models/Simulation/DataBus/IVehicleInfo.cs diff --git a/VectoCore/Models/Simulation/IVectoRun.cs b/VectoCore/VectoCore/Models/Simulation/IVectoRun.cs similarity index 100% rename from VectoCore/Models/Simulation/IVectoRun.cs rename to VectoCore/VectoCore/Models/Simulation/IVectoRun.cs diff --git a/VectoCore/Models/Simulation/IVehicleContainer.cs b/VectoCore/VectoCore/Models/Simulation/IVehicleContainer.cs similarity index 100% rename from VectoCore/Models/Simulation/IVehicleContainer.cs rename to VectoCore/VectoCore/Models/Simulation/IVehicleContainer.cs diff --git a/VectoCore/Models/Simulation/Impl/DistanceRun.cs b/VectoCore/VectoCore/Models/Simulation/Impl/DistanceRun.cs similarity index 100% rename from VectoCore/Models/Simulation/Impl/DistanceRun.cs rename to VectoCore/VectoCore/Models/Simulation/Impl/DistanceRun.cs diff --git a/VectoCore/Models/Simulation/Impl/JobContainer.cs b/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs similarity index 100% rename from VectoCore/Models/Simulation/Impl/JobContainer.cs rename to VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs diff --git a/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs similarity index 100% rename from VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs rename to VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs diff --git a/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs similarity index 100% rename from VectoCore/Models/Simulation/Impl/SimulatorFactory.cs rename to VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs diff --git a/VectoCore/Models/Simulation/Impl/TimeRun.cs b/VectoCore/VectoCore/Models/Simulation/Impl/TimeRun.cs similarity index 100% rename from VectoCore/Models/Simulation/Impl/TimeRun.cs rename to VectoCore/VectoCore/Models/Simulation/Impl/TimeRun.cs diff --git a/VectoCore/Models/Simulation/Impl/VectoRun.cs b/VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs similarity index 100% rename from VectoCore/Models/Simulation/Impl/VectoRun.cs rename to VectoCore/VectoCore/Models/Simulation/Impl/VectoRun.cs diff --git a/VectoCore/Models/Simulation/Impl/VehicleContainer.cs b/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs similarity index 100% rename from VectoCore/Models/Simulation/Impl/VehicleContainer.cs rename to VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs diff --git a/VectoCore/Models/SimulationComponent/Data/AccelerationCurve.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/AccelerationCurve.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/AccelerationCurve.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/AccelerationCurve.cs diff --git a/VectoCore/Models/SimulationComponent/Data/AuxSupplyPowerReader.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/AuxSupplyPowerReader.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/AuxSupplyPowerReader.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/AuxSupplyPowerReader.cs diff --git a/VectoCore/Models/SimulationComponent/Data/AuxiliaryData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/AuxiliaryData.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/AuxiliaryData.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/AuxiliaryData.cs diff --git a/VectoCore/Models/SimulationComponent/Data/AuxiliaryType.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/AuxiliaryType.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/AuxiliaryType.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/AuxiliaryType.cs diff --git a/VectoCore/Models/SimulationComponent/Data/AxleGearData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/AxleGearData.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/AxleGearData.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/AxleGearData.cs diff --git a/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs diff --git a/VectoCore/Models/SimulationComponent/Data/CrossWindCorrectionCurveReader.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/CrossWindCorrectionCurveReader.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/CrossWindCorrectionCurveReader.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/CrossWindCorrectionCurveReader.cs diff --git a/VectoCore/Models/SimulationComponent/Data/CrossWindCorrectionMode.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/CrossWindCorrectionMode.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/CrossWindCorrectionMode.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/CrossWindCorrectionMode.cs diff --git a/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionCdxALookup.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionCdxALookup.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionCdxALookup.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionCdxALookup.cs diff --git a/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionVAirBeta.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionVAirBeta.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionVAirBeta.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/CrosswindCorrectionVAirBeta.cs diff --git a/VectoCore/Models/SimulationComponent/Data/CycleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/CycleData.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/CycleData.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/CycleData.cs diff --git a/VectoCore/Models/SimulationComponent/Data/DriverData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/DriverData.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/DriverData.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/DriverData.cs diff --git a/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs diff --git a/VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs diff --git a/VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs diff --git a/VectoCore/Models/SimulationComponent/Data/Engine/PT1Curve.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/PT1Curve.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/Engine/PT1Curve.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/PT1Curve.cs diff --git a/VectoCore/Models/SimulationComponent/Data/FullLoadCurve.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/FullLoadCurve.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/FullLoadCurve.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/FullLoadCurve.cs diff --git a/VectoCore/Models/SimulationComponent/Data/Gearbox/GearData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/GearData.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/Gearbox/GearData.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/GearData.cs diff --git a/VectoCore/Models/SimulationComponent/Data/Gearbox/ShiftPolygon.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/ShiftPolygon.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/Gearbox/ShiftPolygon.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/ShiftPolygon.cs diff --git a/VectoCore/Models/SimulationComponent/Data/Gearbox/TorqueConverterData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TorqueConverterData.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/Gearbox/TorqueConverterData.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TorqueConverterData.cs diff --git a/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs diff --git a/VectoCore/Models/SimulationComponent/Data/GearboxData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/GearboxData.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxData.cs diff --git a/VectoCore/Models/SimulationComponent/Data/GearboxType.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxType.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/GearboxType.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/GearboxType.cs diff --git a/VectoCore/Models/SimulationComponent/Data/ICrossWindCorrection.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/ICrossWindCorrection.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/ICrossWindCorrection.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/ICrossWindCorrection.cs diff --git a/VectoCore/Models/SimulationComponent/Data/RetarderData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/RetarderData.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/RetarderData.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/RetarderData.cs diff --git a/VectoCore/Models/SimulationComponent/Data/RetarderLossMap.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/RetarderLossMap.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/RetarderLossMap.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/RetarderLossMap.cs diff --git a/VectoCore/Models/SimulationComponent/Data/SimulationComponentData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/SimulationComponentData.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/SimulationComponentData.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/SimulationComponentData.cs diff --git a/VectoCore/Models/SimulationComponent/Data/VehicleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Data/VehicleData.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs diff --git a/VectoCore/Models/SimulationComponent/IAuxiliary.cs b/VectoCore/VectoCore/Models/SimulationComponent/IAuxiliary.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/IAuxiliary.cs rename to VectoCore/VectoCore/Models/SimulationComponent/IAuxiliary.cs diff --git a/VectoCore/Models/SimulationComponent/IBrakes.cs b/VectoCore/VectoCore/Models/SimulationComponent/IBrakes.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/IBrakes.cs rename to VectoCore/VectoCore/Models/SimulationComponent/IBrakes.cs diff --git a/VectoCore/Models/SimulationComponent/IClutch.cs b/VectoCore/VectoCore/Models/SimulationComponent/IClutch.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/IClutch.cs rename to VectoCore/VectoCore/Models/SimulationComponent/IClutch.cs diff --git a/VectoCore/Models/SimulationComponent/ICombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/ICombustionEngine.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/ICombustionEngine.cs rename to VectoCore/VectoCore/Models/SimulationComponent/ICombustionEngine.cs diff --git a/VectoCore/Models/SimulationComponent/ICombustionEngineIdleController.cs b/VectoCore/VectoCore/Models/SimulationComponent/ICombustionEngineIdleController.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/ICombustionEngineIdleController.cs rename to VectoCore/VectoCore/Models/SimulationComponent/ICombustionEngineIdleController.cs diff --git a/VectoCore/Models/SimulationComponent/IDriver.cs b/VectoCore/VectoCore/Models/SimulationComponent/IDriver.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/IDriver.cs rename to VectoCore/VectoCore/Models/SimulationComponent/IDriver.cs diff --git a/VectoCore/Models/SimulationComponent/IDriverActions.cs b/VectoCore/VectoCore/Models/SimulationComponent/IDriverActions.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/IDriverActions.cs rename to VectoCore/VectoCore/Models/SimulationComponent/IDriverActions.cs diff --git a/VectoCore/Models/SimulationComponent/IDriverStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/IDriverStrategy.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/IDriverStrategy.cs rename to VectoCore/VectoCore/Models/SimulationComponent/IDriverStrategy.cs diff --git a/VectoCore/Models/SimulationComponent/IDrivingCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/IDrivingCycle.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/IDrivingCycle.cs rename to VectoCore/VectoCore/Models/SimulationComponent/IDrivingCycle.cs diff --git a/VectoCore/Models/SimulationComponent/IDrivingCycleInfo.cs b/VectoCore/VectoCore/Models/SimulationComponent/IDrivingCycleInfo.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/IDrivingCycleInfo.cs rename to VectoCore/VectoCore/Models/SimulationComponent/IDrivingCycleInfo.cs diff --git a/VectoCore/Models/SimulationComponent/IEngineAuxPort.cs b/VectoCore/VectoCore/Models/SimulationComponent/IEngineAuxPort.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/IEngineAuxPort.cs rename to VectoCore/VectoCore/Models/SimulationComponent/IEngineAuxPort.cs diff --git a/VectoCore/Models/SimulationComponent/IGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/IGearbox.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/IGearbox.cs rename to VectoCore/VectoCore/Models/SimulationComponent/IGearbox.cs diff --git a/VectoCore/Models/SimulationComponent/IPowerTrainComponent.cs b/VectoCore/VectoCore/Models/SimulationComponent/IPowerTrainComponent.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/IPowerTrainComponent.cs rename to VectoCore/VectoCore/Models/SimulationComponent/IPowerTrainComponent.cs diff --git a/VectoCore/Models/SimulationComponent/IPowertrainSimulation.cs b/VectoCore/VectoCore/Models/SimulationComponent/IPowertrainSimulation.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/IPowertrainSimulation.cs rename to VectoCore/VectoCore/Models/SimulationComponent/IPowertrainSimulation.cs diff --git a/VectoCore/Models/SimulationComponent/IShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/IShiftStrategy.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/IShiftStrategy.cs rename to VectoCore/VectoCore/Models/SimulationComponent/IShiftStrategy.cs diff --git a/VectoCore/Models/SimulationComponent/IVehicle.cs b/VectoCore/VectoCore/Models/SimulationComponent/IVehicle.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/IVehicle.cs rename to VectoCore/VectoCore/Models/SimulationComponent/IVehicle.cs diff --git a/VectoCore/Models/SimulationComponent/IWheels.cs b/VectoCore/VectoCore/Models/SimulationComponent/IWheels.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/IWheels.cs rename to VectoCore/VectoCore/Models/SimulationComponent/IWheels.cs diff --git a/VectoCore/Models/SimulationComponent/Impl/AxleGear.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/AxleGear.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Impl/AxleGear.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/AxleGear.cs diff --git a/VectoCore/Models/SimulationComponent/Impl/Brakes.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Brakes.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Impl/Brakes.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/Brakes.cs diff --git a/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs diff --git a/VectoCore/Models/SimulationComponent/Impl/Clutch.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Impl/Clutch.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs diff --git a/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs diff --git a/VectoCore/Models/SimulationComponent/Impl/CycleClutch.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleClutch.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Impl/CycleClutch.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleClutch.cs diff --git a/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs diff --git a/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs diff --git a/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/DistanceBasedDrivingCycle.cs diff --git a/VectoCore/Models/SimulationComponent/Impl/Driver.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Impl/Driver.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs diff --git a/VectoCore/Models/SimulationComponent/Impl/DummyRetarder.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DummyRetarder.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Impl/DummyRetarder.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/DummyRetarder.cs diff --git a/VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs diff --git a/VectoCore/Models/SimulationComponent/Impl/EngineOnlyCombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineOnlyCombustionEngine.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Impl/EngineOnlyCombustionEngine.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineOnlyCombustionEngine.cs diff --git a/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Impl/Gearbox.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs diff --git a/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs diff --git a/VectoCore/Models/SimulationComponent/Impl/Retarder.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Retarder.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Impl/Retarder.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/Retarder.cs diff --git a/VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/ShiftStrategy.cs diff --git a/VectoCore/Models/SimulationComponent/Impl/TimeBasedDrivingCycle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/TimeBasedDrivingCycle.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Impl/TimeBasedDrivingCycle.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/TimeBasedDrivingCycle.cs diff --git a/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Impl/Vehicle.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs diff --git a/VectoCore/Models/SimulationComponent/Impl/Wheels.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Wheels.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/Impl/Wheels.cs rename to VectoCore/VectoCore/Models/SimulationComponent/Impl/Wheels.cs diff --git a/VectoCore/Models/SimulationComponent/VectoSimulationComponent.cs b/VectoCore/VectoCore/Models/SimulationComponent/VectoSimulationComponent.cs similarity index 100% rename from VectoCore/Models/SimulationComponent/VectoSimulationComponent.cs rename to VectoCore/VectoCore/Models/SimulationComponent/VectoSimulationComponent.cs diff --git a/VectoCore/OutputData/DeclarationReport.cs b/VectoCore/VectoCore/OutputData/DeclarationReport.cs similarity index 100% rename from VectoCore/OutputData/DeclarationReport.cs rename to VectoCore/VectoCore/OutputData/DeclarationReport.cs diff --git a/VectoCore/OutputData/FileIO/FileOutputWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs similarity index 100% rename from VectoCore/OutputData/FileIO/FileOutputWriter.cs rename to VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs diff --git a/VectoCore/OutputData/IDataWriter.cs b/VectoCore/VectoCore/OutputData/IDataWriter.cs similarity index 100% rename from VectoCore/OutputData/IDataWriter.cs rename to VectoCore/VectoCore/OutputData/IDataWriter.cs diff --git a/VectoCore/OutputData/IModalDataContainer.cs b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs similarity index 100% rename from VectoCore/OutputData/IModalDataContainer.cs rename to VectoCore/VectoCore/OutputData/IModalDataContainer.cs diff --git a/VectoCore/OutputData/ModalDataContainer.cs b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs similarity index 100% rename from VectoCore/OutputData/ModalDataContainer.cs rename to VectoCore/VectoCore/OutputData/ModalDataContainer.cs diff --git a/VectoCore/OutputData/PDF/PDFDeclarationReport.cs b/VectoCore/VectoCore/OutputData/PDF/PDFDeclarationReport.cs similarity index 100% rename from VectoCore/OutputData/PDF/PDFDeclarationReport.cs rename to VectoCore/VectoCore/OutputData/PDF/PDFDeclarationReport.cs diff --git a/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs similarity index 100% rename from VectoCore/OutputData/SummaryDataContainer.cs rename to VectoCore/VectoCore/OutputData/SummaryDataContainer.cs diff --git a/VectoCore/Properties/AssemblyInfo.cs b/VectoCore/VectoCore/Properties/AssemblyInfo.cs similarity index 100% rename from VectoCore/Properties/AssemblyInfo.cs rename to VectoCore/VectoCore/Properties/AssemblyInfo.cs diff --git a/VectoCore/Properties/Version.cs b/VectoCore/VectoCore/Properties/Version.cs similarity index 100% rename from VectoCore/Properties/Version.cs rename to VectoCore/VectoCore/Properties/Version.cs diff --git a/VectoCore/Properties/Version.tt b/VectoCore/VectoCore/Properties/Version.tt similarity index 100% rename from VectoCore/Properties/Version.tt rename to VectoCore/VectoCore/Properties/Version.tt diff --git a/VectoCore/Resources/Declaration/DefaultTC.vtcc b/VectoCore/VectoCore/Resources/Declaration/DefaultTC.vtcc similarity index 100% rename from VectoCore/Resources/Declaration/DefaultTC.vtcc rename to VectoCore/VectoCore/Resources/Declaration/DefaultTC.vtcc diff --git a/VectoCore/Resources/Declaration/MissionCycles/Coach.vdri b/VectoCore/VectoCore/Resources/Declaration/MissionCycles/Coach.vdri similarity index 100% rename from VectoCore/Resources/Declaration/MissionCycles/Coach.vdri rename to VectoCore/VectoCore/Resources/Declaration/MissionCycles/Coach.vdri diff --git a/VectoCore/Resources/Declaration/MissionCycles/Construction.vdri b/VectoCore/VectoCore/Resources/Declaration/MissionCycles/Construction.vdri similarity index 100% rename from VectoCore/Resources/Declaration/MissionCycles/Construction.vdri rename to VectoCore/VectoCore/Resources/Declaration/MissionCycles/Construction.vdri diff --git a/VectoCore/Resources/Declaration/MissionCycles/HeavyUrban.vdri b/VectoCore/VectoCore/Resources/Declaration/MissionCycles/HeavyUrban.vdri similarity index 100% rename from VectoCore/Resources/Declaration/MissionCycles/HeavyUrban.vdri rename to VectoCore/VectoCore/Resources/Declaration/MissionCycles/HeavyUrban.vdri diff --git a/VectoCore/Resources/Declaration/MissionCycles/Interurban.vdri b/VectoCore/VectoCore/Resources/Declaration/MissionCycles/Interurban.vdri similarity index 100% rename from VectoCore/Resources/Declaration/MissionCycles/Interurban.vdri rename to VectoCore/VectoCore/Resources/Declaration/MissionCycles/Interurban.vdri diff --git a/VectoCore/Resources/Declaration/MissionCycles/LongHaul.vdri b/VectoCore/VectoCore/Resources/Declaration/MissionCycles/LongHaul.vdri similarity index 100% rename from VectoCore/Resources/Declaration/MissionCycles/LongHaul.vdri rename to VectoCore/VectoCore/Resources/Declaration/MissionCycles/LongHaul.vdri diff --git a/VectoCore/Resources/Declaration/MissionCycles/MunicipalUtility.vdri b/VectoCore/VectoCore/Resources/Declaration/MissionCycles/MunicipalUtility.vdri similarity index 100% rename from VectoCore/Resources/Declaration/MissionCycles/MunicipalUtility.vdri rename to VectoCore/VectoCore/Resources/Declaration/MissionCycles/MunicipalUtility.vdri diff --git a/VectoCore/Resources/Declaration/MissionCycles/RegionalDelivery.vdri b/VectoCore/VectoCore/Resources/Declaration/MissionCycles/RegionalDelivery.vdri similarity index 100% rename from VectoCore/Resources/Declaration/MissionCycles/RegionalDelivery.vdri rename to VectoCore/VectoCore/Resources/Declaration/MissionCycles/RegionalDelivery.vdri diff --git a/VectoCore/Resources/Declaration/MissionCycles/Suburban.vdri b/VectoCore/VectoCore/Resources/Declaration/MissionCycles/Suburban.vdri similarity index 100% rename from VectoCore/Resources/Declaration/MissionCycles/Suburban.vdri rename to VectoCore/VectoCore/Resources/Declaration/MissionCycles/Suburban.vdri diff --git a/VectoCore/Resources/Declaration/MissionCycles/Urban.vdri b/VectoCore/VectoCore/Resources/Declaration/MissionCycles/Urban.vdri similarity index 100% rename from VectoCore/Resources/Declaration/MissionCycles/Urban.vdri rename to VectoCore/VectoCore/Resources/Declaration/MissionCycles/Urban.vdri diff --git a/VectoCore/Resources/Declaration/MissionCycles/UrbanDelivery.vdri b/VectoCore/VectoCore/Resources/Declaration/MissionCycles/UrbanDelivery.vdri similarity index 100% rename from VectoCore/Resources/Declaration/MissionCycles/UrbanDelivery.vdri rename to VectoCore/VectoCore/Resources/Declaration/MissionCycles/UrbanDelivery.vdri diff --git a/VectoCore/Resources/Declaration/PT1.csv b/VectoCore/VectoCore/Resources/Declaration/PT1.csv similarity index 100% rename from VectoCore/Resources/Declaration/PT1.csv rename to VectoCore/VectoCore/Resources/Declaration/PT1.csv diff --git a/VectoCore/Resources/Declaration/Report/4x2r.png b/VectoCore/VectoCore/Resources/Declaration/Report/4x2r.png similarity index 100% rename from VectoCore/Resources/Declaration/Report/4x2r.png rename to VectoCore/VectoCore/Resources/Declaration/Report/4x2r.png diff --git a/VectoCore/Resources/Declaration/Report/4x2rt.png b/VectoCore/VectoCore/Resources/Declaration/Report/4x2rt.png similarity index 100% rename from VectoCore/Resources/Declaration/Report/4x2rt.png rename to VectoCore/VectoCore/Resources/Declaration/Report/4x2rt.png diff --git a/VectoCore/Resources/Declaration/Report/4x2tt.png b/VectoCore/VectoCore/Resources/Declaration/Report/4x2tt.png similarity index 100% rename from VectoCore/Resources/Declaration/Report/4x2tt.png rename to VectoCore/VectoCore/Resources/Declaration/Report/4x2tt.png diff --git a/VectoCore/Resources/Declaration/Report/6x2r.png b/VectoCore/VectoCore/Resources/Declaration/Report/6x2r.png similarity index 100% rename from VectoCore/Resources/Declaration/Report/6x2r.png rename to VectoCore/VectoCore/Resources/Declaration/Report/6x2r.png diff --git a/VectoCore/Resources/Declaration/Report/6x2rt.png b/VectoCore/VectoCore/Resources/Declaration/Report/6x2rt.png similarity index 100% rename from VectoCore/Resources/Declaration/Report/6x2rt.png rename to VectoCore/VectoCore/Resources/Declaration/Report/6x2rt.png diff --git a/VectoCore/Resources/Declaration/Report/6x2tt.png b/VectoCore/VectoCore/Resources/Declaration/Report/6x2tt.png similarity index 100% rename from VectoCore/Resources/Declaration/Report/6x2tt.png rename to VectoCore/VectoCore/Resources/Declaration/Report/6x2tt.png diff --git a/VectoCore/Resources/Declaration/Report/Undef.png b/VectoCore/VectoCore/Resources/Declaration/Report/Undef.png similarity index 100% rename from VectoCore/Resources/Declaration/Report/Undef.png rename to VectoCore/VectoCore/Resources/Declaration/Report/Undef.png diff --git a/VectoCore/Resources/Declaration/Report/cyclePageTemplate.pdf b/VectoCore/VectoCore/Resources/Declaration/Report/cyclePageTemplate.pdf similarity index 100% rename from VectoCore/Resources/Declaration/Report/cyclePageTemplate.pdf rename to VectoCore/VectoCore/Resources/Declaration/Report/cyclePageTemplate.pdf diff --git a/VectoCore/Resources/Declaration/Report/title2CyclesTemplate.pdf b/VectoCore/VectoCore/Resources/Declaration/Report/title2CyclesTemplate.pdf similarity index 100% rename from VectoCore/Resources/Declaration/Report/title2CyclesTemplate.pdf rename to VectoCore/VectoCore/Resources/Declaration/Report/title2CyclesTemplate.pdf diff --git a/VectoCore/Resources/Declaration/Report/title3CyclesTemplate.pdf b/VectoCore/VectoCore/Resources/Declaration/Report/title3CyclesTemplate.pdf similarity index 100% rename from VectoCore/Resources/Declaration/Report/title3CyclesTemplate.pdf rename to VectoCore/VectoCore/Resources/Declaration/Report/title3CyclesTemplate.pdf diff --git a/VectoCore/Resources/Declaration/Rims.csv b/VectoCore/VectoCore/Resources/Declaration/Rims.csv similarity index 100% rename from VectoCore/Resources/Declaration/Rims.csv rename to VectoCore/VectoCore/Resources/Declaration/Rims.csv diff --git a/VectoCore/Resources/Declaration/SegmentTable.csv b/VectoCore/VectoCore/Resources/Declaration/SegmentTable.csv similarity index 100% rename from VectoCore/Resources/Declaration/SegmentTable.csv rename to VectoCore/VectoCore/Resources/Declaration/SegmentTable.csv diff --git a/VectoCore/Resources/Declaration/VACC/Truck.vacc b/VectoCore/VectoCore/Resources/Declaration/VACC/Truck.vacc similarity index 100% rename from VectoCore/Resources/Declaration/VACC/Truck.vacc rename to VectoCore/VectoCore/Resources/Declaration/VACC/Truck.vacc diff --git a/VectoCore/Resources/Declaration/VAUX/ALT-Tech.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/ALT-Tech.csv similarity index 100% rename from VectoCore/Resources/Declaration/VAUX/ALT-Tech.csv rename to VectoCore/VectoCore/Resources/Declaration/VAUX/ALT-Tech.csv diff --git a/VectoCore/Resources/Declaration/VAUX/ES-Tech.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/ES-Tech.csv similarity index 100% rename from VectoCore/Resources/Declaration/VAUX/ES-Tech.csv rename to VectoCore/VectoCore/Resources/Declaration/VAUX/ES-Tech.csv diff --git a/VectoCore/Resources/Declaration/VAUX/Fan-Tech.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/Fan-Tech.csv similarity index 100% rename from VectoCore/Resources/Declaration/VAUX/Fan-Tech.csv rename to VectoCore/VectoCore/Resources/Declaration/VAUX/Fan-Tech.csv diff --git a/VectoCore/Resources/Declaration/VAUX/HVAC-Table.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/HVAC-Table.csv similarity index 100% rename from VectoCore/Resources/Declaration/VAUX/HVAC-Table.csv rename to VectoCore/VectoCore/Resources/Declaration/VAUX/HVAC-Table.csv diff --git a/VectoCore/Resources/Declaration/VAUX/PS-Table.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/PS-Table.csv similarity index 100% rename from VectoCore/Resources/Declaration/VAUX/PS-Table.csv rename to VectoCore/VectoCore/Resources/Declaration/VAUX/PS-Table.csv diff --git a/VectoCore/Resources/Declaration/VAUX/SP-Table.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Table.csv similarity index 100% rename from VectoCore/Resources/Declaration/VAUX/SP-Table.csv rename to VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Table.csv diff --git a/VectoCore/Resources/Declaration/VAUX/SP-Tech.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Tech.csv similarity index 100% rename from VectoCore/Resources/Declaration/VAUX/SP-Tech.csv rename to VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Tech.csv diff --git a/VectoCore/Resources/Declaration/VCDV/parameters.csv b/VectoCore/VectoCore/Resources/Declaration/VCDV/parameters.csv similarity index 100% rename from VectoCore/Resources/Declaration/VCDV/parameters.csv rename to VectoCore/VectoCore/Resources/Declaration/VCDV/parameters.csv diff --git a/VectoCore/Resources/Declaration/WHTC-Weighting-Factors.csv b/VectoCore/VectoCore/Resources/Declaration/WHTC-Weighting-Factors.csv similarity index 100% rename from VectoCore/Resources/Declaration/WHTC-Weighting-Factors.csv rename to VectoCore/VectoCore/Resources/Declaration/WHTC-Weighting-Factors.csv diff --git a/VectoCore/Resources/Declaration/Wheels.csv b/VectoCore/VectoCore/Resources/Declaration/Wheels.csv similarity index 100% rename from VectoCore/Resources/Declaration/Wheels.csv rename to VectoCore/VectoCore/Resources/Declaration/Wheels.csv diff --git a/VectoCore/Utils/DataTableExtensionMethods.cs b/VectoCore/VectoCore/Utils/DataTableExtensionMethods.cs similarity index 100% rename from VectoCore/Utils/DataTableExtensionMethods.cs rename to VectoCore/VectoCore/Utils/DataTableExtensionMethods.cs diff --git a/VectoCore/Utils/DateTimeFallbackDeserializer.cs b/VectoCore/VectoCore/Utils/DateTimeFallbackDeserializer.cs similarity index 100% rename from VectoCore/Utils/DateTimeFallbackDeserializer.cs rename to VectoCore/VectoCore/Utils/DateTimeFallbackDeserializer.cs diff --git a/VectoCore/Utils/DelauneyMap.cs b/VectoCore/VectoCore/Utils/DelauneyMap.cs similarity index 100% rename from VectoCore/Utils/DelauneyMap.cs rename to VectoCore/VectoCore/Utils/DelauneyMap.cs diff --git a/VectoCore/Utils/DoubleExtensionMethods.cs b/VectoCore/VectoCore/Utils/DoubleExtensionMethods.cs similarity index 100% rename from VectoCore/Utils/DoubleExtensionMethods.cs rename to VectoCore/VectoCore/Utils/DoubleExtensionMethods.cs diff --git a/VectoCore/Utils/EnumHelper.cs b/VectoCore/VectoCore/Utils/EnumHelper.cs similarity index 100% rename from VectoCore/Utils/EnumHelper.cs rename to VectoCore/VectoCore/Utils/EnumHelper.cs diff --git a/VectoCore/Utils/EnumberableExtensionMethods.cs b/VectoCore/VectoCore/Utils/EnumberableExtensionMethods.cs similarity index 100% rename from VectoCore/Utils/EnumberableExtensionMethods.cs rename to VectoCore/VectoCore/Utils/EnumberableExtensionMethods.cs diff --git a/VectoCore/Utils/Formulas.cs b/VectoCore/VectoCore/Utils/Formulas.cs similarity index 100% rename from VectoCore/Utils/Formulas.cs rename to VectoCore/VectoCore/Utils/Formulas.cs diff --git a/VectoCore/Utils/IntExtensionMethods.cs b/VectoCore/VectoCore/Utils/IntExtensionMethods.cs similarity index 100% rename from VectoCore/Utils/IntExtensionMethods.cs rename to VectoCore/VectoCore/Utils/IntExtensionMethods.cs diff --git a/VectoCore/Utils/Physics.cs b/VectoCore/VectoCore/Utils/Physics.cs similarity index 100% rename from VectoCore/Utils/Physics.cs rename to VectoCore/VectoCore/Utils/Physics.cs diff --git a/VectoCore/Utils/RessourceHelper.cs b/VectoCore/VectoCore/Utils/RessourceHelper.cs similarity index 100% rename from VectoCore/Utils/RessourceHelper.cs rename to VectoCore/VectoCore/Utils/RessourceHelper.cs diff --git a/VectoCore/Utils/SI.cs b/VectoCore/VectoCore/Utils/SI.cs similarity index 100% rename from VectoCore/Utils/SI.cs rename to VectoCore/VectoCore/Utils/SI.cs diff --git a/VectoCore/Utils/SearchAlgorithm.cs b/VectoCore/VectoCore/Utils/SearchAlgorithm.cs similarity index 100% rename from VectoCore/Utils/SearchAlgorithm.cs rename to VectoCore/VectoCore/Utils/SearchAlgorithm.cs diff --git a/VectoCore/Utils/StringExtensionMethods.cs b/VectoCore/VectoCore/Utils/StringExtensionMethods.cs similarity index 100% rename from VectoCore/Utils/StringExtensionMethods.cs rename to VectoCore/VectoCore/Utils/StringExtensionMethods.cs diff --git a/VectoCore/Utils/SwitchExtension.cs b/VectoCore/VectoCore/Utils/SwitchExtension.cs similarity index 100% rename from VectoCore/Utils/SwitchExtension.cs rename to VectoCore/VectoCore/Utils/SwitchExtension.cs diff --git a/VectoCore/Utils/Validation.cs b/VectoCore/VectoCore/Utils/Validation.cs similarity index 100% rename from VectoCore/Utils/Validation.cs rename to VectoCore/VectoCore/Utils/Validation.cs diff --git a/VectoCore/Utils/VectoCSVFile.cs b/VectoCore/VectoCore/Utils/VectoCSVFile.cs similarity index 100% rename from VectoCore/Utils/VectoCSVFile.cs rename to VectoCore/VectoCore/Utils/VectoCSVFile.cs diff --git a/VectoCore/Utils/VectoMath.cs b/VectoCore/VectoCore/Utils/VectoMath.cs similarity index 100% rename from VectoCore/Utils/VectoMath.cs rename to VectoCore/VectoCore/Utils/VectoMath.cs diff --git a/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj similarity index 100% rename from VectoCore/VectoCore.csproj rename to VectoCore/VectoCore/VectoCore.csproj diff --git a/VectoCore/VectoCore.csproj.DotSettings b/VectoCore/VectoCore/VectoCore.csproj.DotSettings similarity index 100% rename from VectoCore/VectoCore.csproj.DotSettings rename to VectoCore/VectoCore/VectoCore.csproj.DotSettings diff --git a/VectoCore/VectoCore.smproj b/VectoCore/VectoCore/VectoCore.smproj similarity index 100% rename from VectoCore/VectoCore.smproj rename to VectoCore/VectoCore/VectoCore.smproj diff --git a/VectoCore/app.config b/VectoCore/VectoCore/app.config similarity index 100% rename from VectoCore/app.config rename to VectoCore/VectoCore/app.config diff --git a/VectoCore/packages.config b/VectoCore/VectoCore/packages.config similarity index 100% rename from VectoCore/packages.config rename to VectoCore/VectoCore/packages.config diff --git a/VectoCoreTest/Comparison VECTO-2.2 VECTO-3.xlsx b/VectoCore/VectoCoreTest/Comparison VECTO-2.2 VECTO-3.xlsx similarity index 100% rename from VectoCoreTest/Comparison VECTO-2.2 VECTO-3.xlsx rename to VectoCore/VectoCoreTest/Comparison VECTO-2.2 VECTO-3.xlsx diff --git a/VectoCoreTest/Exceptions/ExceptionTests.cs b/VectoCore/VectoCoreTest/Exceptions/ExceptionTests.cs similarity index 100% rename from VectoCoreTest/Exceptions/ExceptionTests.cs rename to VectoCore/VectoCoreTest/Exceptions/ExceptionTests.cs diff --git a/VectoCoreTest/FileIO/JsonTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonTest.cs similarity index 100% rename from VectoCoreTest/FileIO/JsonTest.cs rename to VectoCore/VectoCoreTest/FileIO/JsonTest.cs diff --git a/VectoCoreTest/FileIO/SimulationDataReaderTest.cs b/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs similarity index 100% rename from VectoCoreTest/FileIO/SimulationDataReaderTest.cs rename to VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs diff --git a/VectoCoreTest/GraphProgram.cs b/VectoCore/VectoCoreTest/GraphProgram.cs similarity index 100% rename from VectoCoreTest/GraphProgram.cs rename to VectoCore/VectoCoreTest/GraphProgram.cs diff --git a/VectoCoreTest/Integration/BusAuxiliaries/AuxDemandTest.cs b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AuxDemandTest.cs similarity index 100% rename from VectoCoreTest/Integration/BusAuxiliaries/AuxDemandTest.cs rename to VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AuxDemandTest.cs diff --git a/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs similarity index 100% rename from VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs rename to VectoCore/VectoCoreTest/Integration/BusAuxiliaries/BusAdapterTest.cs diff --git a/VectoCoreTest/Integration/BusAuxiliaries/SimpleCycleTest.cs b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/SimpleCycleTest.cs similarity index 100% rename from VectoCoreTest/Integration/BusAuxiliaries/SimpleCycleTest.cs rename to VectoCore/VectoCoreTest/Integration/BusAuxiliaries/SimpleCycleTest.cs diff --git a/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs b/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs similarity index 100% rename from VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs rename to VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs diff --git a/VectoCoreTest/Integration/CoachPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs similarity index 100% rename from VectoCoreTest/Integration/CoachPowerTrain.cs rename to VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs diff --git a/VectoCoreTest/Integration/DeclarationReportTest.cs b/VectoCore/VectoCoreTest/Integration/DeclarationReportTest.cs similarity index 100% rename from VectoCoreTest/Integration/DeclarationReportTest.cs rename to VectoCore/VectoCoreTest/Integration/DeclarationReportTest.cs diff --git a/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs b/VectoCore/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs similarity index 100% rename from VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs rename to VectoCore/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs diff --git a/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs b/VectoCore/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs similarity index 100% rename from VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs rename to VectoCore/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs diff --git a/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs b/VectoCore/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs similarity index 100% rename from VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs rename to VectoCore/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs diff --git a/VectoCoreTest/Integration/FullCycleDeclarationTest.cs b/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs similarity index 100% rename from VectoCoreTest/Integration/FullCycleDeclarationTest.cs rename to VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs diff --git a/VectoCoreTest/Integration/SimpleDrivingCycles.cs b/VectoCore/VectoCoreTest/Integration/SimpleDrivingCycles.cs similarity index 100% rename from VectoCoreTest/Integration/SimpleDrivingCycles.cs rename to VectoCore/VectoCoreTest/Integration/SimpleDrivingCycles.cs diff --git a/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs b/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs similarity index 100% rename from VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs rename to VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs diff --git a/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs b/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs similarity index 100% rename from VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs rename to VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs diff --git a/VectoCoreTest/Integration/Truck40tPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs similarity index 100% rename from VectoCoreTest/Integration/Truck40tPowerTrain.cs rename to VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs diff --git a/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs similarity index 100% rename from VectoCoreTest/Models/Declaration/DeclarationDataTest.cs rename to VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs diff --git a/VectoCoreTest/Models/Simulation/AuxTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs similarity index 100% rename from VectoCoreTest/Models/Simulation/AuxTests.cs rename to VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs diff --git a/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs similarity index 100% rename from VectoCoreTest/Models/Simulation/DrivingCycleTests.cs rename to VectoCore/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs diff --git a/VectoCoreTest/Models/Simulation/FactoryTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/FactoryTest.cs similarity index 100% rename from VectoCoreTest/Models/Simulation/FactoryTest.cs rename to VectoCore/VectoCoreTest/Models/Simulation/FactoryTest.cs diff --git a/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs similarity index 100% rename from VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs rename to VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs diff --git a/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs similarity index 100% rename from VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs rename to VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs diff --git a/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs similarity index 100% rename from VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs rename to VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs diff --git a/VectoCoreTest/Models/Simulation/PwheelModeTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs similarity index 100% rename from VectoCoreTest/Models/Simulation/PwheelModeTests.cs rename to VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs diff --git a/VectoCoreTest/Models/Simulation/SimulationTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/SimulationTests.cs similarity index 100% rename from VectoCoreTest/Models/Simulation/SimulationTests.cs rename to VectoCore/VectoCoreTest/Models/Simulation/SimulationTests.cs diff --git a/VectoCoreTest/Models/Simulation/VechicleContainerTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/VechicleContainerTests.cs similarity index 100% rename from VectoCoreTest/Models/Simulation/VechicleContainerTests.cs rename to VectoCore/VectoCoreTest/Models/Simulation/VechicleContainerTests.cs diff --git a/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs similarity index 100% rename from VectoCoreTest/Models/SimulationComponent/ClutchTest.cs rename to VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs diff --git a/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs similarity index 100% rename from VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs rename to VectoCore/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs diff --git a/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs similarity index 100% rename from VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs rename to VectoCore/VectoCoreTest/Models/SimulationComponent/DistanceBasedDrivingCycleTest.cs diff --git a/VectoCoreTest/Models/SimulationComponent/DriverTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs similarity index 100% rename from VectoCoreTest/Models/SimulationComponent/DriverTest.cs rename to VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs diff --git a/VectoCoreTest/Models/SimulationComponent/GearboxPowertrainTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxPowertrainTest.cs similarity index 100% rename from VectoCoreTest/Models/SimulationComponent/GearboxPowertrainTest.cs rename to VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxPowertrainTest.cs diff --git a/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs similarity index 100% rename from VectoCoreTest/Models/SimulationComponent/GearboxTest.cs rename to VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxTest.cs diff --git a/VectoCoreTest/Models/SimulationComponent/RetarderTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/RetarderTest.cs similarity index 100% rename from VectoCoreTest/Models/SimulationComponent/RetarderTest.cs rename to VectoCore/VectoCoreTest/Models/SimulationComponent/RetarderTest.cs diff --git a/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs similarity index 100% rename from VectoCoreTest/Models/SimulationComponent/VehicleTest.cs rename to VectoCore/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs diff --git a/VectoCoreTest/Models/SimulationComponent/WheelsTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/WheelsTest.cs similarity index 100% rename from VectoCoreTest/Models/SimulationComponent/WheelsTest.cs rename to VectoCore/VectoCoreTest/Models/SimulationComponent/WheelsTest.cs diff --git a/VectoCoreTest/Models/SimulationComponentData/AccelerationCurveTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/AccelerationCurveTest.cs similarity index 100% rename from VectoCoreTest/Models/SimulationComponentData/AccelerationCurveTest.cs rename to VectoCore/VectoCoreTest/Models/SimulationComponentData/AccelerationCurveTest.cs diff --git a/VectoCoreTest/Models/SimulationComponentData/AuxiliaryTypeHelperTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/AuxiliaryTypeHelperTest.cs similarity index 100% rename from VectoCoreTest/Models/SimulationComponentData/AuxiliaryTypeHelperTest.cs rename to VectoCore/VectoCoreTest/Models/SimulationComponentData/AuxiliaryTypeHelperTest.cs diff --git a/VectoCoreTest/Models/SimulationComponentData/DistanceCycleDataTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/DistanceCycleDataTest.cs similarity index 100% rename from VectoCoreTest/Models/SimulationComponentData/DistanceCycleDataTest.cs rename to VectoCore/VectoCoreTest/Models/SimulationComponentData/DistanceCycleDataTest.cs diff --git a/VectoCoreTest/Models/SimulationComponentData/FuelConsumptionMapTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/FuelConsumptionMapTest.cs similarity index 100% rename from VectoCoreTest/Models/SimulationComponentData/FuelConsumptionMapTest.cs rename to VectoCore/VectoCoreTest/Models/SimulationComponentData/FuelConsumptionMapTest.cs diff --git a/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs similarity index 100% rename from VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs rename to VectoCore/VectoCoreTest/Models/SimulationComponentData/FullLoadCurveTest.cs diff --git a/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs similarity index 100% rename from VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs rename to VectoCore/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs diff --git a/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs similarity index 100% rename from VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs rename to VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs diff --git a/VectoCoreTest/Models/SimulationComponentData/VehicleDataTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/VehicleDataTest.cs similarity index 100% rename from VectoCoreTest/Models/SimulationComponentData/VehicleDataTest.cs rename to VectoCore/VectoCoreTest/Models/SimulationComponentData/VehicleDataTest.cs diff --git a/VectoCoreTest/Properties/AssemblyInfo.cs b/VectoCore/VectoCoreTest/Properties/AssemblyInfo.cs similarity index 100% rename from VectoCoreTest/Properties/AssemblyInfo.cs rename to VectoCore/VectoCoreTest/Properties/AssemblyInfo.cs diff --git a/VectoCoreTest/Properties/Settings.Designer.cs b/VectoCore/VectoCoreTest/Properties/Settings.Designer.cs similarity index 100% rename from VectoCoreTest/Properties/Settings.Designer.cs rename to VectoCore/VectoCoreTest/Properties/Settings.Designer.cs diff --git a/VectoCoreTest/Properties/Settings.settings b/VectoCore/VectoCoreTest/Properties/Settings.settings similarity index 100% rename from VectoCoreTest/Properties/Settings.settings rename to VectoCore/VectoCoreTest/Properties/Settings.settings diff --git a/VectoCoreTest/Reports/ModDataTest.cs b/VectoCore/VectoCoreTest/Reports/ModDataTest.cs similarity index 100% rename from VectoCoreTest/Reports/ModDataTest.cs rename to VectoCore/VectoCoreTest/Reports/ModDataTest.cs diff --git a/VectoCoreTest/Reports/SumWriterTest.cs b/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs similarity index 100% rename from VectoCoreTest/Reports/SumWriterTest.cs rename to VectoCore/VectoCoreTest/Reports/SumWriterTest.cs diff --git a/VectoCoreTest/TestData/AxleGearLossInterpolation.csv b/VectoCore/VectoCoreTest/TestData/AxleGearLossInterpolation.csv similarity index 100% rename from VectoCoreTest/TestData/AxleGearLossInterpolation.csv rename to VectoCore/VectoCoreTest/TestData/AxleGearLossInterpolation.csv diff --git a/VectoCoreTest/TestData/Components/12t Delivery Truck.veng b/VectoCore/VectoCoreTest/TestData/Components/12t Delivery Truck.veng similarity index 100% rename from VectoCoreTest/TestData/Components/12t Delivery Truck.veng rename to VectoCore/VectoCoreTest/TestData/Components/12t Delivery Truck.veng diff --git a/VectoCoreTest/TestData/Components/12t Delivery Truck.vfld b/VectoCore/VectoCoreTest/TestData/Components/12t Delivery Truck.vfld similarity index 100% rename from VectoCoreTest/TestData/Components/12t Delivery Truck.vfld rename to VectoCore/VectoCoreTest/TestData/Components/12t Delivery Truck.vfld diff --git a/VectoCoreTest/TestData/Components/12t Delivery Truck.vgbx b/VectoCore/VectoCoreTest/TestData/Components/12t Delivery Truck.vgbx similarity index 100% rename from VectoCoreTest/TestData/Components/12t Delivery Truck.vgbx rename to VectoCore/VectoCoreTest/TestData/Components/12t Delivery Truck.vgbx diff --git a/VectoCoreTest/TestData/Components/12t Delivery Truck.vmap b/VectoCore/VectoCoreTest/TestData/Components/12t Delivery Truck.vmap similarity index 100% rename from VectoCoreTest/TestData/Components/12t Delivery Truck.vmap rename to VectoCore/VectoCoreTest/TestData/Components/12t Delivery Truck.vmap diff --git a/VectoCoreTest/TestData/Components/12t Delivery Truck.vveh b/VectoCore/VectoCoreTest/TestData/Components/12t Delivery Truck.vveh similarity index 100% rename from VectoCoreTest/TestData/Components/12t Delivery Truck.vveh rename to VectoCore/VectoCoreTest/TestData/Components/12t Delivery Truck.vveh diff --git a/VectoCoreTest/TestData/Components/24t Coach Engine.vfld b/VectoCore/VectoCoreTest/TestData/Components/24t Coach Engine.vfld similarity index 100% rename from VectoCoreTest/TestData/Components/24t Coach Engine.vfld rename to VectoCore/VectoCoreTest/TestData/Components/24t Coach Engine.vfld diff --git a/VectoCoreTest/TestData/Components/24t Coach LessThanTwoGears.vgbx b/VectoCore/VectoCoreTest/TestData/Components/24t Coach LessThanTwoGears.vgbx similarity index 100% rename from VectoCoreTest/TestData/Components/24t Coach LessThanTwoGears.vgbx rename to VectoCore/VectoCoreTest/TestData/Components/24t Coach LessThanTwoGears.vgbx diff --git a/VectoCoreTest/TestData/Components/24t Coach.veng b/VectoCore/VectoCoreTest/TestData/Components/24t Coach.veng similarity index 100% rename from VectoCoreTest/TestData/Components/24t Coach.veng rename to VectoCore/VectoCoreTest/TestData/Components/24t Coach.veng diff --git a/VectoCoreTest/TestData/Components/24t Coach.vfld b/VectoCore/VectoCoreTest/TestData/Components/24t Coach.vfld similarity index 100% rename from VectoCoreTest/TestData/Components/24t Coach.vfld rename to VectoCore/VectoCoreTest/TestData/Components/24t Coach.vfld diff --git a/VectoCoreTest/TestData/Components/24t Coach.vgbx b/VectoCore/VectoCoreTest/TestData/Components/24t Coach.vgbx similarity index 100% rename from VectoCoreTest/TestData/Components/24t Coach.vgbx rename to VectoCore/VectoCoreTest/TestData/Components/24t Coach.vgbx diff --git a/VectoCoreTest/TestData/Components/24t Coach.vmap b/VectoCore/VectoCoreTest/TestData/Components/24t Coach.vmap similarity index 100% rename from VectoCoreTest/TestData/Components/24t Coach.vmap rename to VectoCore/VectoCoreTest/TestData/Components/24t Coach.vmap diff --git a/VectoCoreTest/TestData/Components/24t Coach.vveh b/VectoCore/VectoCoreTest/TestData/Components/24t Coach.vveh similarity index 100% rename from VectoCoreTest/TestData/Components/24t Coach.vveh rename to VectoCore/VectoCoreTest/TestData/Components/24t Coach.vveh diff --git a/VectoCoreTest/TestData/Components/24t CoachInterpolated.vmap b/VectoCore/VectoCoreTest/TestData/Components/24t CoachInterpolated.vmap similarity index 100% rename from VectoCoreTest/TestData/Components/24t CoachInterpolated.vmap rename to VectoCore/VectoCoreTest/TestData/Components/24t CoachInterpolated.vmap diff --git a/VectoCoreTest/TestData/Components/24t Coach_IncPT1.veng b/VectoCore/VectoCoreTest/TestData/Components/24t Coach_IncPT1.veng similarity index 100% rename from VectoCoreTest/TestData/Components/24t Coach_IncPT1.veng rename to VectoCore/VectoCoreTest/TestData/Components/24t Coach_IncPT1.veng diff --git a/VectoCoreTest/TestData/Components/24t Coach_IncPT1.vfld b/VectoCore/VectoCoreTest/TestData/Components/24t Coach_IncPT1.vfld similarity index 100% rename from VectoCoreTest/TestData/Components/24t Coach_IncPT1.vfld rename to VectoCore/VectoCoreTest/TestData/Components/24t Coach_IncPT1.vfld diff --git a/VectoCoreTest/TestData/Components/24t Coach_smallLossMap.vgbx b/VectoCore/VectoCoreTest/TestData/Components/24t Coach_smallLossMap.vgbx similarity index 100% rename from VectoCoreTest/TestData/Components/24t Coach_smallLossMap.vgbx rename to VectoCore/VectoCoreTest/TestData/Components/24t Coach_smallLossMap.vgbx diff --git a/VectoCoreTest/TestData/Components/24t_Coach_ALT.vaux b/VectoCore/VectoCoreTest/TestData/Components/24t_Coach_ALT.vaux similarity index 100% rename from VectoCoreTest/TestData/Components/24t_Coach_ALT.vaux rename to VectoCore/VectoCoreTest/TestData/Components/24t_Coach_ALT.vaux diff --git a/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.veng b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.veng similarity index 100% rename from VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.veng rename to VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.veng diff --git a/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vfld b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vfld similarity index 100% rename from VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vfld rename to VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vfld diff --git a/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vgbx b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vgbx similarity index 100% rename from VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vgbx rename to VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vgbx diff --git a/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vmap b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vmap similarity index 100% rename from VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vmap rename to VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vmap diff --git a/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vveh b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vveh similarity index 100% rename from VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vveh rename to VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vveh diff --git a/VectoCoreTest/TestData/Components/Axle 40t Truck.vtlm b/VectoCore/VectoCoreTest/TestData/Components/Axle 40t Truck.vtlm similarity index 100% rename from VectoCoreTest/TestData/Components/Axle 40t Truck.vtlm rename to VectoCore/VectoCoreTest/TestData/Components/Axle 40t Truck.vtlm diff --git a/VectoCoreTest/TestData/Components/Axle.vtlm b/VectoCore/VectoCoreTest/TestData/Components/Axle.vtlm similarity index 100% rename from VectoCoreTest/TestData/Components/Axle.vtlm rename to VectoCore/VectoCoreTest/TestData/Components/Axle.vtlm diff --git a/VectoCoreTest/TestData/Components/Coach.vacc b/VectoCore/VectoCoreTest/TestData/Components/Coach.vacc similarity index 100% rename from VectoCoreTest/TestData/Components/Coach.vacc rename to VectoCore/VectoCoreTest/TestData/Components/Coach.vacc diff --git a/VectoCoreTest/TestData/Components/Direct Gear.vtlm b/VectoCore/VectoCoreTest/TestData/Components/Direct Gear.vtlm similarity index 100% rename from VectoCoreTest/TestData/Components/Direct Gear.vtlm rename to VectoCore/VectoCoreTest/TestData/Components/Direct Gear.vtlm diff --git a/VectoCoreTest/TestData/Components/FullLoadCurve insufficient columns.vfld b/VectoCore/VectoCoreTest/TestData/Components/FullLoadCurve insufficient columns.vfld similarity index 100% rename from VectoCoreTest/TestData/Components/FullLoadCurve insufficient columns.vfld rename to VectoCore/VectoCoreTest/TestData/Components/FullLoadCurve insufficient columns.vfld diff --git a/VectoCoreTest/TestData/Components/FullLoadCurve insufficient entries.vfld b/VectoCore/VectoCoreTest/TestData/Components/FullLoadCurve insufficient entries.vfld similarity index 100% rename from VectoCoreTest/TestData/Components/FullLoadCurve insufficient entries.vfld rename to VectoCore/VectoCoreTest/TestData/Components/FullLoadCurve insufficient entries.vfld diff --git a/VectoCoreTest/TestData/Components/FullLoadCurve no header.vfld b/VectoCore/VectoCoreTest/TestData/Components/FullLoadCurve no header.vfld similarity index 100% rename from VectoCoreTest/TestData/Components/FullLoadCurve no header.vfld rename to VectoCore/VectoCoreTest/TestData/Components/FullLoadCurve no header.vfld diff --git a/VectoCoreTest/TestData/Components/FullLoadCurve wrong header.vfld b/VectoCore/VectoCoreTest/TestData/Components/FullLoadCurve wrong header.vfld similarity index 100% rename from VectoCoreTest/TestData/Components/FullLoadCurve wrong header.vfld rename to VectoCore/VectoCoreTest/TestData/Components/FullLoadCurve wrong header.vfld diff --git a/VectoCoreTest/TestData/Components/Gearbox.vfld b/VectoCore/VectoCoreTest/TestData/Components/Gearbox.vfld similarity index 100% rename from VectoCoreTest/TestData/Components/Gearbox.vfld rename to VectoCore/VectoCoreTest/TestData/Components/Gearbox.vfld diff --git a/VectoCoreTest/TestData/Components/Indirect Gear.vtlm b/VectoCore/VectoCoreTest/TestData/Components/Indirect Gear.vtlm similarity index 100% rename from VectoCoreTest/TestData/Components/Indirect Gear.vtlm rename to VectoCore/VectoCoreTest/TestData/Components/Indirect Gear.vtlm diff --git a/VectoCoreTest/TestData/Components/Indirect Gear_smallRange.vtlm b/VectoCore/VectoCoreTest/TestData/Components/Indirect Gear_smallRange.vtlm similarity index 100% rename from VectoCoreTest/TestData/Components/Indirect Gear_smallRange.vtlm rename to VectoCore/VectoCoreTest/TestData/Components/Indirect Gear_smallRange.vtlm diff --git a/VectoCoreTest/TestData/Components/Retarder.vrlm b/VectoCore/VectoCoreTest/TestData/Components/Retarder.vrlm similarity index 100% rename from VectoCoreTest/TestData/Components/Retarder.vrlm rename to VectoCore/VectoCoreTest/TestData/Components/Retarder.vrlm diff --git a/VectoCoreTest/TestData/Components/ShiftPolygons.vgbs b/VectoCore/VectoCoreTest/TestData/Components/ShiftPolygons.vgbs similarity index 100% rename from VectoCoreTest/TestData/Components/ShiftPolygons.vgbs rename to VectoCore/VectoCoreTest/TestData/Components/ShiftPolygons.vgbs diff --git a/VectoCoreTest/TestData/Components/Truck.vacc b/VectoCore/VectoCoreTest/TestData/Components/Truck.vacc similarity index 100% rename from VectoCoreTest/TestData/Components/Truck.vacc rename to VectoCore/VectoCoreTest/TestData/Components/Truck.vacc diff --git a/VectoCoreTest/TestData/Components/limited.vtlm b/VectoCore/VectoCoreTest/TestData/Components/limited.vtlm similarity index 100% rename from VectoCoreTest/TestData/Components/limited.vtlm rename to VectoCore/VectoCoreTest/TestData/Components/limited.vtlm diff --git a/VectoCoreTest/TestData/Cycles/1-Gear-Test-dist.vdri b/VectoCore/VectoCoreTest/TestData/Cycles/1-Gear-Test-dist.vdri similarity index 100% rename from VectoCoreTest/TestData/Cycles/1-Gear-Test-dist.vdri rename to VectoCore/VectoCoreTest/TestData/Cycles/1-Gear-Test-dist.vdri diff --git a/VectoCoreTest/TestData/Cycles/Coach Engine Only FullLoad.vdri b/VectoCore/VectoCoreTest/TestData/Cycles/Coach Engine Only FullLoad.vdri similarity index 100% rename from VectoCoreTest/TestData/Cycles/Coach Engine Only FullLoad.vdri rename to VectoCore/VectoCoreTest/TestData/Cycles/Coach Engine Only FullLoad.vdri diff --git a/VectoCoreTest/TestData/Cycles/Coach Engine Only Paux.vdri b/VectoCore/VectoCoreTest/TestData/Cycles/Coach Engine Only Paux.vdri similarity index 100% rename from VectoCoreTest/TestData/Cycles/Coach Engine Only Paux.vdri rename to VectoCore/VectoCoreTest/TestData/Cycles/Coach Engine Only Paux.vdri diff --git a/VectoCoreTest/TestData/Cycles/Coach Engine Only Paux_var-dt.vdri b/VectoCore/VectoCoreTest/TestData/Cycles/Coach Engine Only Paux_var-dt.vdri similarity index 100% rename from VectoCoreTest/TestData/Cycles/Coach Engine Only Paux_var-dt.vdri rename to VectoCore/VectoCoreTest/TestData/Cycles/Coach Engine Only Paux_var-dt.vdri diff --git a/VectoCoreTest/TestData/Cycles/Coach Engine Only short.vdri b/VectoCore/VectoCoreTest/TestData/Cycles/Coach Engine Only short.vdri similarity index 100% rename from VectoCoreTest/TestData/Cycles/Coach Engine Only short.vdri rename to VectoCore/VectoCoreTest/TestData/Cycles/Coach Engine Only short.vdri diff --git a/VectoCoreTest/TestData/Cycles/Coach Engine Only.vdri b/VectoCore/VectoCoreTest/TestData/Cycles/Coach Engine Only.vdri similarity index 100% rename from VectoCoreTest/TestData/Cycles/Coach Engine Only.vdri rename to VectoCore/VectoCoreTest/TestData/Cycles/Coach Engine Only.vdri diff --git a/VectoCoreTest/TestData/Cycles/Coach First Cycle only.vdri b/VectoCore/VectoCoreTest/TestData/Cycles/Coach First Cycle only.vdri similarity index 100% rename from VectoCoreTest/TestData/Cycles/Coach First Cycle only.vdri rename to VectoCore/VectoCoreTest/TestData/Cycles/Coach First Cycle only.vdri diff --git a/VectoCoreTest/TestData/Cycles/Coach time based short.vdri b/VectoCore/VectoCoreTest/TestData/Cycles/Coach time based short.vdri similarity index 100% rename from VectoCoreTest/TestData/Cycles/Coach time based short.vdri rename to VectoCore/VectoCoreTest/TestData/Cycles/Coach time based short.vdri diff --git a/VectoCoreTest/TestData/Cycles/Coach time based.vdri b/VectoCore/VectoCoreTest/TestData/Cycles/Coach time based.vdri similarity index 100% rename from VectoCoreTest/TestData/Cycles/Coach time based.vdri rename to VectoCore/VectoCoreTest/TestData/Cycles/Coach time based.vdri diff --git a/VectoCoreTest/TestData/Cycles/Coach.vdri b/VectoCore/VectoCoreTest/TestData/Cycles/Coach.vdri similarity index 100% rename from VectoCoreTest/TestData/Cycles/Coach.vdri rename to VectoCore/VectoCoreTest/TestData/Cycles/Coach.vdri diff --git a/VectoCoreTest/TestData/Cycles/Coach_24t_xshort.vdri b/VectoCore/VectoCoreTest/TestData/Cycles/Coach_24t_xshort.vdri similarity index 100% rename from VectoCoreTest/TestData/Cycles/Coach_24t_xshort.vdri rename to VectoCore/VectoCoreTest/TestData/Cycles/Coach_24t_xshort.vdri diff --git a/VectoCoreTest/TestData/Cycles/Cycle time field missing.vdri b/VectoCore/VectoCoreTest/TestData/Cycles/Cycle time field missing.vdri similarity index 100% rename from VectoCoreTest/TestData/Cycles/Cycle time field missing.vdri rename to VectoCore/VectoCoreTest/TestData/Cycles/Cycle time field missing.vdri diff --git a/VectoCoreTest/TestData/Cycles/Engine Only1.vdri b/VectoCore/VectoCoreTest/TestData/Cycles/Engine Only1.vdri similarity index 100% rename from VectoCoreTest/TestData/Cycles/Engine Only1.vdri rename to VectoCore/VectoCoreTest/TestData/Cycles/Engine Only1.vdri diff --git a/VectoCoreTest/TestData/Cycles/Engine Only2.vdri b/VectoCore/VectoCoreTest/TestData/Cycles/Engine Only2.vdri similarity index 100% rename from VectoCoreTest/TestData/Cycles/Engine Only2.vdri rename to VectoCore/VectoCoreTest/TestData/Cycles/Engine Only2.vdri diff --git a/VectoCoreTest/TestData/Cycles/Engine Only3.vdri b/VectoCore/VectoCoreTest/TestData/Cycles/Engine Only3.vdri similarity index 100% rename from VectoCoreTest/TestData/Cycles/Engine Only3.vdri rename to VectoCore/VectoCoreTest/TestData/Cycles/Engine Only3.vdri diff --git a/VectoCoreTest/TestData/Cycles/EngineOnly_FullLoad.vdri b/VectoCore/VectoCoreTest/TestData/Cycles/EngineOnly_FullLoad.vdri similarity index 100% rename from VectoCoreTest/TestData/Cycles/EngineOnly_FullLoad.vdri rename to VectoCore/VectoCoreTest/TestData/Cycles/EngineOnly_FullLoad.vdri diff --git a/VectoCoreTest/TestData/Cycles/LOT2_rural Engine Only.vmod b/VectoCore/VectoCoreTest/TestData/Cycles/LOT2_rural Engine Only.vmod similarity index 100% rename from VectoCoreTest/TestData/Cycles/LOT2_rural Engine Only.vmod rename to VectoCore/VectoCoreTest/TestData/Cycles/LOT2_rural Engine Only.vmod diff --git a/VectoCoreTest/TestData/Cycles/LongHaul_short.vdri b/VectoCore/VectoCoreTest/TestData/Cycles/LongHaul_short.vdri similarity index 100% rename from VectoCoreTest/TestData/Cycles/LongHaul_short.vdri rename to VectoCore/VectoCoreTest/TestData/Cycles/LongHaul_short.vdri diff --git a/VectoCoreTest/TestData/EngineFullLoadJumps.csv b/VectoCore/VectoCoreTest/TestData/EngineFullLoadJumps.csv similarity index 100% rename from VectoCoreTest/TestData/EngineFullLoadJumps.csv rename to VectoCore/VectoCoreTest/TestData/EngineFullLoadJumps.csv diff --git a/VectoCoreTest/TestData/EngineTests.csv b/VectoCore/VectoCoreTest/TestData/EngineTests.csv similarity index 100% rename from VectoCoreTest/TestData/EngineTests.csv rename to VectoCore/VectoCoreTest/TestData/EngineTests.csv diff --git a/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.v2.vsum b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.v2.vsum similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.v2.vsum rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.v2.vsum diff --git a/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vecto b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vecto similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vecto rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vecto diff --git a/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.veng b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.veng similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.veng rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.veng diff --git a/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vfld b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vfld similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vfld rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vfld diff --git a/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vgbx b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vgbx similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vgbx rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vgbx diff --git a/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vmap b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vmap similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vmap rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vmap diff --git a/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh diff --git a/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Axle.vtlm b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Axle.vtlm similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Axle.vtlm rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Axle.vtlm diff --git a/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm diff --git a/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm diff --git a/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Retarder.vrlm b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Retarder.vrlm similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Retarder.vrlm rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Retarder.vrlm diff --git a/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vcdv b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vcdv similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vcdv rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vcdv diff --git a/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vecto b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vecto similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vecto rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vecto diff --git a/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.veng b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.veng similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.veng rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.veng diff --git a/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vfld b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vfld similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vfld rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vfld diff --git a/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vgbx b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vgbx similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vgbx rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vgbx diff --git a/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vmap b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vmap similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vmap rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vmap diff --git a/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vveh b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vveh similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vveh rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vveh diff --git a/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach_Coach.vmod b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach_Coach.vmod similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach_Coach.vmod rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach_Coach.vmod diff --git a/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach_LOT2_rural Engine Only.vmod b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach_LOT2_rural Engine Only.vmod similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach_LOT2_rural Engine Only.vmod rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach_LOT2_rural Engine Only.vmod diff --git a/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t_Coach_ALT.vaux b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t_Coach_ALT.vaux similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t_Coach_ALT.vaux rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t_Coach_ALT.vaux diff --git a/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Axle.vtlm b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Axle.vtlm similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Axle.vtlm rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Axle.vtlm diff --git a/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Coach Engine Only.vdri b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Coach Engine Only.vdri similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Coach Engine Only.vdri rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Coach Engine Only.vdri diff --git a/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Coach.vacc b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Coach.vacc similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Coach.vacc rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Coach.vacc diff --git a/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Coach.vdri b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Coach.vdri similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Coach.vdri rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Coach.vdri diff --git a/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Direct Gear.vtlm b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Direct Gear.vtlm similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Direct Gear.vtlm rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Direct Gear.vtlm diff --git a/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Indirect Gear.vtlm b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Indirect Gear.vtlm similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Indirect Gear.vtlm rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Indirect Gear.vtlm diff --git a/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Retarder.vrlm b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Retarder.vrlm similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Retarder.vrlm rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/Retarder.vrlm diff --git a/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/ShiftPolygons.vgbs b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/ShiftPolygons.vgbs similarity index 100% rename from VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/ShiftPolygons.vgbs rename to VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/ShiftPolygons.vgbs diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/24t Coach.vfld b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/24t Coach.vfld similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/24t Coach.vfld rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/24t Coach.vfld diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/24t Coach.vmap b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/24t Coach.vmap similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/24t Coach.vmap rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/24t Coach.vmap diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/AdvAuxTest.aaux b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/AdvAuxTest.aaux similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/AdvAuxTest.aaux rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/AdvAuxTest.aaux diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/BusDatabase.abdb b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/BusDatabase.abdb similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/BusDatabase.abdb rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/BusDatabase.abdb diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/DEFAULT_1-Cylinder_1-Stage_393ccm.ACMP b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/DEFAULT_1-Cylinder_1-Stage_393ccm.ACMP similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/DEFAULT_1-Cylinder_1-Stage_393ccm.ACMP rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/DEFAULT_1-Cylinder_1-Stage_393ccm.ACMP diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/DEFAULT_2-Cylinder_1-Stage_650ccm.ACMP b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/DEFAULT_2-Cylinder_1-Stage_650ccm.ACMP similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/DEFAULT_2-Cylinder_1-Stage_650ccm.ACMP rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/DEFAULT_2-Cylinder_1-Stage_650ccm.ACMP diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/DEFAULT_2-Cylinder_2-Stage_398ccm.ACMP b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/DEFAULT_2-Cylinder_2-Stage_398ccm.ACMP similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/DEFAULT_2-Cylinder_2-Stage_398ccm.ACMP rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/DEFAULT_2-Cylinder_2-Stage_398ccm.ACMP diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/DEFAULT_3-Cylinder_2-Stage_598ccm.ACMP b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/DEFAULT_3-Cylinder_2-Stage_598ccm.ACMP similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/DEFAULT_3-Cylinder_2-Stage_598ccm.ACMP rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/DEFAULT_3-Cylinder_2-Stage_598ccm.ACMP diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/DefaultClimatic.aenv b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/DefaultClimatic.aenv similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/DefaultClimatic.aenv rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/DefaultClimatic.aenv diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_AccelerateAtBrake_80_0_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_AccelerateAtBrake_80_0_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_AccelerateAtBrake_80_0_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_AccelerateAtBrake_80_0_level.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_AccelerateBeforeBrake_80_0_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_AccelerateBeforeBrake_80_0_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_AccelerateBeforeBrake_80_0_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_AccelerateBeforeBrake_80_0_level.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_AccelerateWhileBrake_80_0_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_AccelerateWhileBrake_80_0_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_AccelerateWhileBrake_80_0_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_AccelerateWhileBrake_80_0_level.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_20_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_20_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_20_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_20_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_20_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_20_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_20_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_20_level.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_40_downhill_1.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_40_downhill_1.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_40_downhill_1.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_40_downhill_1.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_40_downhill_3.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_40_downhill_3.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_40_downhill_3.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_40_downhill_3.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_40_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_40_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_40_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_40_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_60_downhill_1.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_60_downhill_1.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_60_downhill_1.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_60_downhill_1.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_60_downhill_3.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_60_downhill_3.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_60_downhill_3.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_60_downhill_3.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_60_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_60_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_60_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_60_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_downhill_1.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_downhill_1.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_downhill_1.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_downhill_1.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_downhill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_downhill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_downhill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_downhill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_downhill_3.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_downhill_3.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_downhill_3.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_downhill_3.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_level.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_level_5kWAux.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_level_5kWAux.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_level_5kWAux.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_level_5kWAux.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_uphill_1.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_uphill_1.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_uphill_1.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_uphill_1.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_uphill_10.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_uphill_10.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_uphill_10.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_uphill_10.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_uphill_2.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_uphill_2.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_uphill_2.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_uphill_2.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_uphill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_uphill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_uphill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_uphill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_0_85_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_22_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_22_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_22_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_22_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_downhill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_downhill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_downhill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_downhill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_level.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_uphill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_uphill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_uphill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_uphill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_uphill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_uphill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_uphill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_uphill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_20_60_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_stop_0_85_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_stop_0_85_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_stop_0_85_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Accelerate_stop_0_85_level.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_DecelerateWhileBrake_80_0_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_DecelerateWhileBrake_80_0_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_DecelerateWhileBrake_80_0_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_DecelerateWhileBrake_80_0_level.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_22_20_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_22_20_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_22_20_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_22_20_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_45_0_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_45_0_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_45_0_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_45_0_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_45_0_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_45_0_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_45_0_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_45_0_level.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_45_0_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_45_0_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_45_0_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_45_0_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_60_20_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_60_20_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_60_20_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_60_20_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_60_20_downhill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_60_20_downhill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_60_20_downhill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_60_20_downhill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_60_20_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_60_20_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_60_20_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_60_20_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_60_20_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_60_20_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_60_20_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_60_20_level.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_60_20_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_60_20_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_60_20_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_60_20_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_downhill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_downhill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_downhill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_downhill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_level.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_uphill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_uphill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_uphill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_uphill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_uphill_3.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_uphill_3.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_uphill_3.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_uphill_3.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Decelerate_80_0_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_downhill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_downhill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_downhill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_downhill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_level.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_uphill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_uphill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_uphill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_uphill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_uphill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_uphill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_uphill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_uphill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_10_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_20_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_20_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_20_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_20_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_30_Dec_Increasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_30_Dec_Increasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_30_Dec_Increasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_30_Dec_Increasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_30_Decreasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_30_Decreasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_30_Decreasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_30_Decreasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_30_Increasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_30_Increasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_30_Increasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_30_Increasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_30_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_30_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_30_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_30_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_50_Dec_Increasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_50_Dec_Increasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_50_Dec_Increasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_50_Dec_Increasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_50_Decreasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_50_Decreasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_50_Decreasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_50_Decreasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_50_Increasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_50_Increasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_50_Increasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_50_Increasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_50_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_50_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_50_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_50_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_Dec_Increasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_Dec_Increasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_Dec_Increasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_Dec_Increasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_Decreasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_Decreasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_Decreasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_Decreasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_Increasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_Increasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_Increasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_Increasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_level.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_uphill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_uphill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_uphill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_uphill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_80_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_stop_85_stop_85_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_stop_85_stop_85_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_stop_85_stop_85_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/Vecto2.0/24t Coach_AAux_Cycle_Drive_stop_85_stop_85_level.vmod diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/testCombAlternatorMap_1Alt.AALT b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/testCombAlternatorMap_1Alt.AALT similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/testCombAlternatorMap_1Alt.AALT rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/testCombAlternatorMap_1Alt.AALT diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/testCombAlternatorMap_4Alt.AALT b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/testCombAlternatorMap_4Alt.AALT similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/testCombAlternatorMap_4Alt.AALT rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/testCombAlternatorMap_4Alt.AALT diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/testFuelGoodMap.vmap b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/testFuelGoodMap.vmap similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/testFuelGoodMap.vmap rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/testFuelGoodMap.vmap diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/testHVACssm.AHSM b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/testHVACssm.AHSM similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/testHVACssm.AHSM rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/testHVACssm.AHSM diff --git a/VectoCoreTest/TestData/Integration/BusAuxiliaries/testPneumaticActuationsMap.APAC b/VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/testPneumaticActuationsMap.APAC similarity index 100% rename from VectoCoreTest/TestData/Integration/BusAuxiliaries/testPneumaticActuationsMap.APAC rename to VectoCore/VectoCoreTest/TestData/Integration/BusAuxiliaries/testPneumaticActuationsMap.APAC diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.pdf b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.pdf similarity index 100% rename from VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.pdf rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.pdf diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vecto similarity index 100% rename from VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vecto rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vecto diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.veng similarity index 100% rename from VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.veng rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.veng diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vfld b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vfld similarity index 100% rename from VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vfld rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vfld diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vgbx similarity index 100% rename from VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vgbx rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vgbx diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vmap b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vmap similarity index 100% rename from VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vmap rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vmap diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vsum b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vsum similarity index 100% rename from VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vsum rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vsum diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vsum.json b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vsum.json similarity index 100% rename from VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vsum.json rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vsum.json diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vveh similarity index 100% rename from VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vveh rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.vveh diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Long_Haul_Empty Loading.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Long_Haul_Empty Loading.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Long_Haul_Empty Loading.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Long_Haul_Empty Loading.vmod diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Long_Haul_Full Loading.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Long_Haul_Full Loading.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Long_Haul_Full Loading.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Long_Haul_Full Loading.vmod diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Long_Haul_Reference Loading.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Long_Haul_Reference Loading.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Long_Haul_Reference Loading.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Long_Haul_Reference Loading.vmod diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Regional_Delivery_Empty Loading.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Regional_Delivery_Empty Loading.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Regional_Delivery_Empty Loading.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Regional_Delivery_Empty Loading.vmod diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Regional_Delivery_Full Loading.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Regional_Delivery_Full Loading.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Regional_Delivery_Full Loading.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Regional_Delivery_Full Loading.vmod diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Regional_Delivery_Reference Loading.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Regional_Delivery_Reference Loading.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Regional_Delivery_Reference Loading.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck_Regional_Delivery_Reference Loading.vmod diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/Axle 40t Truck.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/Axle 40t Truck.vtlm similarity index 100% rename from VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/Axle 40t Truck.vtlm rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/Axle 40t Truck.vtlm diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/Axle.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/Axle.vtlm similarity index 100% rename from VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/Axle.vtlm rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/Axle.vtlm diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/Direct Gear.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/Direct Gear.vtlm similarity index 100% rename from VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/Direct Gear.vtlm rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/Direct Gear.vtlm diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/Indirect Gear.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/Indirect Gear.vtlm similarity index 100% rename from VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/Indirect Gear.vtlm rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/Indirect Gear.vtlm diff --git a/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/Retarder.vrlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/Retarder.vrlm similarity index 100% rename from VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/Retarder.vrlm rename to VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/Retarder.vrlm diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_AccelerateAtBrake_80_0_level.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_AccelerateAtBrake_80_0_level.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_AccelerateAtBrake_80_0_level.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_AccelerateAtBrake_80_0_level.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_AccelerateBeforeBrake_80_0_level.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_AccelerateBeforeBrake_80_0_level.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_AccelerateBeforeBrake_80_0_level.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_AccelerateBeforeBrake_80_0_level.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_AccelerateWhileBrake_80_0_level.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_AccelerateWhileBrake_80_0_level.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_AccelerateWhileBrake_80_0_level.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_AccelerateWhileBrake_80_0_level.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_20_downhill_5.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_20_downhill_5.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_20_downhill_5.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_20_downhill_5.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_20_level.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_20_level.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_20_level.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_20_level.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_40_downhill_1.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_40_downhill_1.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_40_downhill_1.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_40_downhill_1.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_40_downhill_3.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_40_downhill_3.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_40_downhill_3.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_40_downhill_3.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_40_downhill_5.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_40_downhill_5.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_40_downhill_5.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_40_downhill_5.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_60_downhill_1.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_60_downhill_1.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_60_downhill_1.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_60_downhill_1.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_60_downhill_3.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_60_downhill_3.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_60_downhill_3.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_60_downhill_3.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_60_downhill_5.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_60_downhill_5.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_60_downhill_5.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_60_downhill_5.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_downhill_1.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_downhill_1.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_downhill_1.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_downhill_1.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_downhill_15.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_downhill_15.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_downhill_15.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_downhill_15.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_downhill_25.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_downhill_25.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_downhill_25.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_downhill_25.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_downhill_3.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_downhill_3.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_downhill_3.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_downhill_3.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_downhill_5.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_downhill_5.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_downhill_5.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_downhill_5.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_level.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_level.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_level.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_level.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_level_5kWAux.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_level_5kWAux.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_level_5kWAux.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_level_5kWAux.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_uphill_1.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_uphill_1.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_uphill_1.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_uphill_1.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_uphill_10.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_uphill_10.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_uphill_10.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_uphill_10.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_uphill_2.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_uphill_2.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_uphill_2.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_uphill_2.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_uphill_25.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_uphill_25.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_uphill_25.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_uphill_25.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_uphill_5.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_uphill_5.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_uphill_5.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_0_85_uphill_5.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_22_uphill_5.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_22_uphill_5.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_22_uphill_5.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_22_uphill_5.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_downhill_15.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_downhill_15.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_downhill_15.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_downhill_15.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_downhill_25.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_downhill_25.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_downhill_25.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_downhill_25.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_downhill_5.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_downhill_5.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_downhill_5.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_downhill_5.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_level.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_level.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_level.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_level.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_uphill_15.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_uphill_15.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_uphill_15.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_uphill_15.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_uphill_25.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_uphill_25.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_uphill_25.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_uphill_25.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_uphill_5.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_uphill_5.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_uphill_5.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_20_60_uphill_5.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_stop_0_85_level.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_stop_0_85_level.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_stop_0_85_level.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Accelerate_stop_0_85_level.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_DecelerateWhileBrake_80_0_level.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_DecelerateWhileBrake_80_0_level.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_DecelerateWhileBrake_80_0_level.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_DecelerateWhileBrake_80_0_level.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_22_20_downhill_5.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_22_20_downhill_5.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_22_20_downhill_5.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_22_20_downhill_5.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_45_0_downhill_5.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_45_0_downhill_5.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_45_0_downhill_5.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_45_0_downhill_5.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_45_0_level.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_45_0_level.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_45_0_level.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_45_0_level.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_45_0_uphill_5.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_45_0_uphill_5.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_45_0_uphill_5.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_45_0_uphill_5.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_60_20_downhill_15.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_60_20_downhill_15.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_60_20_downhill_15.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_60_20_downhill_15.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_60_20_downhill_25.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_60_20_downhill_25.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_60_20_downhill_25.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_60_20_downhill_25.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_60_20_downhill_5.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_60_20_downhill_5.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_60_20_downhill_5.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_60_20_downhill_5.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_60_20_level.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_60_20_level.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_60_20_level.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_60_20_level.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_60_20_uphill_5.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_60_20_uphill_5.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_60_20_uphill_5.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_60_20_uphill_5.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_downhill_15.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_downhill_15.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_downhill_15.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_downhill_15.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_downhill_25.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_downhill_25.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_downhill_25.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_downhill_25.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_downhill_5.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_downhill_5.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_downhill_5.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_downhill_5.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_level.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_level.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_level.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_level.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_uphill_15.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_uphill_15.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_uphill_15.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_uphill_15.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_uphill_3.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_uphill_3.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_uphill_3.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_uphill_3.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_uphill_5.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_uphill_5.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_uphill_5.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Decelerate_80_0_uphill_5.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_downhill_15.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_downhill_15.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_downhill_15.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_downhill_15.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_downhill_25.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_downhill_25.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_downhill_25.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_downhill_25.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_downhill_5.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_downhill_5.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_downhill_5.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_downhill_5.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_level.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_level.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_level.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_level.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_uphill_15.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_uphill_15.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_uphill_15.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_uphill_15.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_uphill_25.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_uphill_25.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_uphill_25.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_uphill_25.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_uphill_5.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_uphill_5.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_uphill_5.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_10_uphill_5.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_20_downhill_15.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_20_downhill_15.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_20_downhill_15.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_20_downhill_15.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_30_Dec_Increasing_Slope.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_30_Dec_Increasing_Slope.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_30_Dec_Increasing_Slope.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_30_Dec_Increasing_Slope.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_30_Decreasing_Slope.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_30_Decreasing_Slope.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_30_Decreasing_Slope.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_30_Decreasing_Slope.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_30_Increasing_Slope.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_30_Increasing_Slope.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_30_Increasing_Slope.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_30_Increasing_Slope.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_30_downhill_15.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_30_downhill_15.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_30_downhill_15.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_30_downhill_15.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_50_Dec_Increasing_Slope.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_50_Dec_Increasing_Slope.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_50_Dec_Increasing_Slope.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_50_Dec_Increasing_Slope.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_50_Decreasing_Slope.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_50_Decreasing_Slope.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_50_Decreasing_Slope.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_50_Decreasing_Slope.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_50_Increasing_Slope.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_50_Increasing_Slope.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_50_Increasing_Slope.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_50_Increasing_Slope.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_50_downhill_15.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_50_downhill_15.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_50_downhill_15.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_50_downhill_15.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_Dec_Increasing_Slope.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_Dec_Increasing_Slope.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_Dec_Increasing_Slope.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_Dec_Increasing_Slope.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_Decreasing_Slope.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_Decreasing_Slope.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_Decreasing_Slope.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_Decreasing_Slope.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_Increasing_Slope.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_Increasing_Slope.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_Increasing_Slope.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_Increasing_Slope.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_downhill_15.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_downhill_15.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_downhill_15.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_downhill_15.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_downhill_5.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_downhill_5.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_downhill_5.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_downhill_5.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_level.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_level.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_level.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_level.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_uphill_15.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_uphill_15.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_uphill_15.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_uphill_15.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_uphill_5.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_uphill_5.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_uphill_5.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_80_uphill_5.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_stop_85_stop_85_level.vdri b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_stop_85_stop_85_level.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_stop_85_stop_85_level.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Cycles/Cycle_Drive_stop_85_stop_85_level.vdri diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vecto similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vecto rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vecto diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.veng b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.veng similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.veng rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.veng diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vfld b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vfld similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vfld rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vfld diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vgbx similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vgbx rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vgbx diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vmap b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vmap similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vmap rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vmap diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vsum b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vsum similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vsum rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vsum diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vsum.json b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vsum.json similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vsum.json rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vsum.json diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vveh similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vveh rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck.vveh diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_AirDrag.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_AirDrag.vecto similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_AirDrag.vecto rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_AirDrag.vecto diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_AccelerateAtBrake_80_0_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_AccelerateAtBrake_80_0_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_AccelerateAtBrake_80_0_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_AccelerateAtBrake_80_0_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_AccelerateBeforeBrake_80_0_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_AccelerateBeforeBrake_80_0_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_AccelerateBeforeBrake_80_0_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_AccelerateBeforeBrake_80_0_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_AccelerateWhileBrake_80_0_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_AccelerateWhileBrake_80_0_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_AccelerateWhileBrake_80_0_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_AccelerateWhileBrake_80_0_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_20_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_20_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_20_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_20_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_20_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_20_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_20_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_20_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_uphill_1.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_uphill_1.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_uphill_1.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_uphill_1.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_uphill_10.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_uphill_10.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_uphill_10.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_uphill_10.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_uphill_2.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_uphill_2.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_uphill_2.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_uphill_2.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_uphill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_uphill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_uphill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_uphill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_22_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_22_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_22_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_22_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_downhill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_downhill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_downhill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_downhill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_uphill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_uphill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_uphill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_uphill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_uphill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_uphill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_uphill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_uphill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_20_60_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_stop_0_85_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_stop_0_85_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_stop_0_85_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Accelerate_stop_0_85_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_DecelerateWhileBrake_80_0_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_DecelerateWhileBrake_80_0_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_DecelerateWhileBrake_80_0_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_DecelerateWhileBrake_80_0_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_22_20_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_22_20_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_22_20_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_22_20_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_45_0_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_45_0_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_45_0_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_45_0_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_45_0_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_45_0_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_45_0_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_45_0_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_45_0_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_45_0_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_45_0_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_45_0_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_60_20_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_60_20_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_60_20_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_60_20_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_60_20_downhill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_60_20_downhill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_60_20_downhill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_60_20_downhill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_60_20_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_60_20_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_60_20_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_60_20_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_60_20_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_60_20_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_60_20_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_60_20_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_60_20_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_60_20_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_60_20_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_60_20_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_downhill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_downhill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_downhill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_downhill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_uphill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_uphill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_uphill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_uphill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_uphill_3.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_uphill_3.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_uphill_3.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_uphill_3.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Decelerate_80_0_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_downhill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_downhill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_downhill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_downhill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_uphill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_uphill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_uphill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_uphill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_uphill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_uphill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_uphill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_uphill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_10_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_20_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_20_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_20_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_20_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_30_Dec_Increasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_30_Dec_Increasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_30_Dec_Increasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_30_Dec_Increasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_30_Decreasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_30_Decreasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_30_Decreasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_30_Decreasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_30_Increasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_30_Increasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_30_Increasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_30_Increasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_30_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_30_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_30_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_30_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_50_Decreasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_50_Decreasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_50_Decreasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_50_Decreasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_50_Increasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_50_Increasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_50_Increasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_50_Increasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_50_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_50_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_50_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_50_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_Dec_Increasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_Dec_Increasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_Dec_Increasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_Dec_Increasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_Decreasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_Decreasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_Decreasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_Decreasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_Increasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_Increasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_Increasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_Increasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_uphill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_uphill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_uphill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_uphill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_80_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_stop_85_stop_85_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_stop_85_stop_85_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_stop_85_stop_85_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_Cycle_Drive_stop_85_stop_85_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_EngineIdle.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_EngineIdle.vecto similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_EngineIdle.vecto rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_EngineIdle.vecto diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_EngineIdle.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_EngineIdle.vgbx similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_EngineIdle.vgbx rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/40t_Long_Haul_Truck_EngineIdle.vgbx diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/Axle 40t Truck.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/Axle 40t Truck.vtlm similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/Axle 40t Truck.vtlm rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/Axle 40t Truck.vtlm diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/Indirect Gear.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/Indirect Gear.vtlm similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/Indirect Gear.vtlm rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/Indirect Gear.vtlm diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/ShiftPolygons.vgbs b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/ShiftPolygons.vgbs similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/ShiftPolygons.vgbs rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/ShiftPolygons.vgbs diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/Truck.vacc b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/Truck.vacc similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/Truck.vacc rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck/Truck.vacc diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vecto similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vecto rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vecto diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.veng b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.veng similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.veng rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.veng diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vfld b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vfld similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vfld rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vfld diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vgbx similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vgbx rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vgbx diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vmap b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vmap similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vmap rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vmap diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vsum b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vsum similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vsum rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vsum diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vsum.json b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vsum.json similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vsum.json rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vsum.json diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vveh similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vveh rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck.vveh diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_40_downhill_1.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_40_downhill_1.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_40_downhill_1.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_40_downhill_1.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_40_downhill_3.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_40_downhill_3.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_40_downhill_3.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_40_downhill_3.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_40_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_40_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_40_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_40_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_60_downhill_1.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_60_downhill_1.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_60_downhill_1.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_60_downhill_1.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_60_downhill_3.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_60_downhill_3.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_60_downhill_3.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_60_downhill_3.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_60_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_60_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_60_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_60_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_1.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_1.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_1.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_1.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_3.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_3.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_3.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_3.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/40t_Long_Haul_Truck_Cycle_Accelerate_0_85_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/Axle 40t Truck.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/Axle 40t Truck.vtlm similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/Axle 40t Truck.vtlm rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/Axle 40t Truck.vtlm diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/Indirect Gear.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/Indirect Gear.vtlm similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/Indirect Gear.vtlm rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/Indirect Gear.vtlm diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/ShiftPolygons.vgbs b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/ShiftPolygons.vgbs similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/ShiftPolygons.vgbs rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/ShiftPolygons.vgbs diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/Truck.vacc b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/Truck.vacc similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/Truck.vacc rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/40t Truck_Overspeed/Truck.vacc diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vecto similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vecto rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vecto diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.veng b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.veng similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.veng rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.veng diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vfld b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vfld similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vfld rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vfld diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vgbx similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vgbx rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vgbx diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vmap b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vmap similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vmap rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vmap diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vsum b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vsum similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vsum rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vsum diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vsum.json b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vsum.json similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vsum.json rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vsum.json diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vveh similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vveh rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach.vveh diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_AccelerateAtBrake_80_0_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_AccelerateAtBrake_80_0_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_AccelerateAtBrake_80_0_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_AccelerateAtBrake_80_0_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_AccelerateBeforeBrake_80_0_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_AccelerateBeforeBrake_80_0_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_AccelerateBeforeBrake_80_0_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_AccelerateBeforeBrake_80_0_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_AccelerateWhileBrake_80_0_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_AccelerateWhileBrake_80_0_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_AccelerateWhileBrake_80_0_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_AccelerateWhileBrake_80_0_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_20_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_20_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_20_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_20_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_20_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_20_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_20_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_20_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_downhill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_downhill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_downhill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_downhill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_uphill_1.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_uphill_1.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_uphill_1.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_uphill_1.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_uphill_10.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_uphill_10.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_uphill_10.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_uphill_10.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_uphill_2.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_uphill_2.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_uphill_2.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_uphill_2.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_uphill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_uphill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_uphill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_uphill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_0_85_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_22_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_22_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_22_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_22_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_downhill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_downhill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_downhill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_downhill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_uphill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_uphill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_uphill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_uphill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_uphill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_uphill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_uphill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_uphill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_20_60_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_stop_0_85_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_stop_0_85_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_stop_0_85_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Accelerate_stop_0_85_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_DecelerateWhileBrake_80_0_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_DecelerateWhileBrake_80_0_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_DecelerateWhileBrake_80_0_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_DecelerateWhileBrake_80_0_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_22_20_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_22_20_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_22_20_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_22_20_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_45_0_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_45_0_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_45_0_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_45_0_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_45_0_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_45_0_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_45_0_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_45_0_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_45_0_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_45_0_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_45_0_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_45_0_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_60_20_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_60_20_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_60_20_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_60_20_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_60_20_downhill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_60_20_downhill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_60_20_downhill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_60_20_downhill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_60_20_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_60_20_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_60_20_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_60_20_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_60_20_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_60_20_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_60_20_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_60_20_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_60_20_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_60_20_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_60_20_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_60_20_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_downhill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_downhill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_downhill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_downhill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_uphill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_uphill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_uphill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_uphill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_uphill_3.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_uphill_3.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_uphill_3.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_uphill_3.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Decelerate_80_0_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_downhill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_downhill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_downhill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_downhill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_uphill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_uphill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_uphill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_uphill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_uphill_25.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_uphill_25.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_uphill_25.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_uphill_25.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_10_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_20_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_20_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_20_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_20_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_30_Dec_Increasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_30_Dec_Increasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_30_Dec_Increasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_30_Dec_Increasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_30_Decreasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_30_Decreasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_30_Decreasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_30_Decreasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_30_Increasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_30_Increasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_30_Increasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_30_Increasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_30_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_30_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_30_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_30_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_50_Decreasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_50_Decreasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_50_Decreasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_50_Decreasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_50_Increasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_50_Increasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_50_Increasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_50_Increasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_50_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_50_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_50_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_50_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_Dec_Increasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_Dec_Increasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_Dec_Increasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_Dec_Increasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_Decreasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_Decreasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_Decreasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_Decreasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_Increasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_Increasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_Increasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_Increasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_downhill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_downhill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_downhill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_downhill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_uphill_15.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_uphill_15.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_uphill_15.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_uphill_15.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_uphill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_uphill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_uphill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_80_uphill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_stop_85_stop_85_level.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_stop_85_stop_85_level.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_stop_85_stop_85_level.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/24t Coach_Cycle_Drive_stop_85_stop_85_level.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/Axle.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/Axle.vtlm similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/Axle.vtlm rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/Axle.vtlm diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/Indirect Gear.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/Indirect Gear.vtlm similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/Indirect Gear.vtlm rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/Indirect Gear.vtlm diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/ShiftPolygons.vgbs b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/ShiftPolygons.vgbs similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/ShiftPolygons.vgbs rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/ShiftPolygons.vgbs diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/Truck.vacc b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/Truck.vacc similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/Truck.vacc rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach/Truck.vacc diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vecto similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vecto rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vecto diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.veng b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.veng similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.veng rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.veng diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vfld b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vfld similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vfld rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vfld diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vgbx similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vgbx rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vgbx diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vmap b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vmap similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vmap rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vmap diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vsum b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vsum similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vsum rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vsum diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vsum.json b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vsum.json similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vsum.json rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vsum.json diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vveh similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vveh rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach.vveh diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_40_downhill_1.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_40_downhill_1.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_40_downhill_1.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_40_downhill_1.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_40_downhill_3.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_40_downhill_3.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_40_downhill_3.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_40_downhill_3.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_40_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_40_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_40_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_40_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_60_downhill_1.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_60_downhill_1.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_60_downhill_1.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_60_downhill_1.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_60_downhill_3.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_60_downhill_3.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_60_downhill_3.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_60_downhill_3.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_60_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_60_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_60_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_60_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_85_downhill_1.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_85_downhill_1.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_85_downhill_1.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_85_downhill_1.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_85_downhill_3.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_85_downhill_3.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_85_downhill_3.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_85_downhill_3.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_85_downhill_5.vmod b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_85_downhill_5.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_85_downhill_5.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/24t Coach_Cycle_Accelerate_0_85_downhill_5.vmod diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/Axle.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/Axle.vtlm similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/Axle.vtlm rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/Axle.vtlm diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/Indirect Gear.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/Indirect Gear.vtlm similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/Indirect Gear.vtlm rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/Indirect Gear.vtlm diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/ShiftPolygons.vgbs b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/ShiftPolygons.vgbs similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/ShiftPolygons.vgbs rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/ShiftPolygons.vgbs diff --git a/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/Truck.vacc b/VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/Truck.vacc similarity index 100% rename from VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/Truck.vacc rename to VectoCore/VectoCoreTest/TestData/Integration/DriverStrategy/Vecto2.2/Coach_Overspeed/Truck.vacc diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/1-Gear-StopTest-dist.vdri b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/1-Gear-StopTest-dist.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/1-Gear-StopTest-dist.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/1-Gear-StopTest-dist.vdri diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/1-Gear-Test-dist.vdri b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/1-Gear-Test-dist.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/1-Gear-Test-dist.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/1-Gear-Test-dist.vdri diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/1-Gear-Test.vdri b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/1-Gear-Test.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/1-Gear-Test.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/1-Gear-Test.vdri diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear.vecto b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear.vecto similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear.vecto rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear.vecto diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear.vsig b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear.vsig similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear.vsig rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear.vsig diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear.vsum b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear.vsum similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear.vsum rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear.vsum diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear.vsum.json b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear.vsum.json similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear.vsum.json rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear.vsum.json diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear_1-Gear-StopTest-dist.vmod b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear_1-Gear-StopTest-dist.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear_1-Gear-StopTest-dist.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear_1-Gear-StopTest-dist.vmod diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear_1-Gear-Test-dist.vmod b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear_1-Gear-Test-dist.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear_1-Gear-Test-dist.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear_1-Gear-Test-dist.vmod diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear_1-Gear-Test.vmod b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear_1-Gear-Test.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear_1-Gear-Test.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear_1-Gear-Test.vmod diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear_Coach_24t_InitTest.vmod b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear_Coach_24t_InitTest.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear_Coach_24t_InitTest.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear_Coach_24t_InitTest.vmod diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear_Coach_24t_xshort.vmod b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear_Coach_24t_xshort.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear_Coach_24t_xshort.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-1Gear_Coach_24t_xshort.vmod diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-8indirectgears.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-8indirectgears.vgbx similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-8indirectgears.vgbx rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach-8indirectgears.vgbx diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach.veng b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach.veng similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach.veng rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach.veng diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach.vfld b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach.vfld similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach.vfld rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach.vfld diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach.vmap b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach.vmap similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach.vmap rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach.vmap diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach.vveh b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach.vveh similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach.vveh rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/24t Coach.vveh diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/Axle.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/Axle.vtlm similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/Axle.vtlm rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/Axle.vtlm diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/Coach.vacc b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/Coach.vacc similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/Coach.vacc rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/Coach.vacc diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/Coach.vdri b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/Coach.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/Coach.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/Coach.vdri diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/Coach_24t_InitTest.vdri b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/Coach_24t_InitTest.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/Coach_24t_InitTest.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/Coach_24t_InitTest.vdri diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/Coach_24t_xshort.vdri b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/Coach_24t_xshort.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/Coach_24t_xshort.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/Coach_24t_xshort.vdri diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/Gearbox.vfld b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/Gearbox.vfld similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/Gearbox.vfld rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/Gearbox.vfld diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/Indirect Gear.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/Indirect Gear.vtlm similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/Indirect Gear.vtlm rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/Indirect Gear.vtlm diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/NoLossGbxMap.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/NoLossGbxMap.vtlm similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/NoLossGbxMap.vtlm rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/NoLossGbxMap.vtlm diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/ShiftPolygons.vgbs b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/ShiftPolygons.vgbs similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/ShiftPolygons.vgbs rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/ShiftPolygons.vgbs diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/SimpleLoss.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/SimpleLoss.vtlm similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/SimpleLoss.vtlm rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/SimpleLoss.vtlm diff --git a/VectoCoreTest/TestData/Integration/FullPowerTrain/unlimited.vacc b/VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/unlimited.vacc similarity index 100% rename from VectoCoreTest/TestData/Integration/FullPowerTrain/unlimited.vacc rename to VectoCore/VectoCoreTest/TestData/Integration/FullPowerTrain/unlimited.vacc diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/1-Gear-StopTest-dist.vdri b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/1-Gear-StopTest-dist.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/1-Gear-StopTest-dist.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/1-Gear-StopTest-dist.vdri diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/1-Gear-Test-dist.vdri b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/1-Gear-Test-dist.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/1-Gear-Test-dist.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/1-Gear-Test-dist.vdri diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/1-Gear-Test.vdri b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/1-Gear-Test.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/1-Gear-Test.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/1-Gear-Test.vdri diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vecto b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vecto similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vecto rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vecto diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vgbx similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vgbx rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vgbx diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vsig b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vsig similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vsig rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vsig diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vsum b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vsum similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vsum rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vsum diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vsum.json b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vsum.json similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vsum.json rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear.vsum.json diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear_1-Gear-StopTest-dist.vmod b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear_1-Gear-StopTest-dist.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear_1-Gear-StopTest-dist.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear_1-Gear-StopTest-dist.vmod diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear_1-Gear-Test-dist.vmod b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear_1-Gear-Test-dist.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear_1-Gear-Test-dist.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear_1-Gear-Test-dist.vmod diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear_1-Gear-Test.vmod b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear_1-Gear-Test.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear_1-Gear-Test.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear_1-Gear-Test.vmod diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear_Coach_24t_InitTest.vmod b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear_Coach_24t_InitTest.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear_Coach_24t_InitTest.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear_Coach_24t_InitTest.vmod diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear_Coach_24t_xshort.vmod b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear_Coach_24t_xshort.vmod similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear_Coach_24t_xshort.vmod rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach-1Gear_Coach_24t_xshort.vmod diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach.veng b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach.veng similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach.veng rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach.veng diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach.vfld b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach.vfld similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach.vfld rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach.vfld diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach.vmap b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach.vmap similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach.vmap rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach.vmap diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach.vveh b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach.vveh similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach.vveh rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/24t Coach.vveh diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/Coach.vacc b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/Coach.vacc similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/Coach.vacc rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/Coach.vacc diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/Coach.vdri b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/Coach.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/Coach.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/Coach.vdri diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/Coach_24t_InitTest.vdri b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/Coach_24t_InitTest.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/Coach_24t_InitTest.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/Coach_24t_InitTest.vdri diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/Coach_24t_xshort.vdri b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/Coach_24t_xshort.vdri similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/Coach_24t_xshort.vdri rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/Coach_24t_xshort.vdri diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/NoLossGbxMap.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/NoLossGbxMap.vtlm similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/NoLossGbxMap.vtlm rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/NoLossGbxMap.vtlm diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/ShiftPolygons.vgbs b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/ShiftPolygons.vgbs similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/ShiftPolygons.vgbs rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/ShiftPolygons.vgbs diff --git a/VectoCoreTest/TestData/Integration/MinimalPowerTrain/unlimited.vacc b/VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/unlimited.vacc similarity index 100% rename from VectoCoreTest/TestData/Integration/MinimalPowerTrain/unlimited.vacc rename to VectoCore/VectoCoreTest/TestData/Integration/MinimalPowerTrain/unlimited.vacc diff --git a/VectoCoreTest/TestData/Jobs/12t Delivery Truck.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/12t Delivery Truck.vecto similarity index 100% rename from VectoCoreTest/TestData/Jobs/12t Delivery Truck.vecto rename to VectoCore/VectoCoreTest/TestData/Jobs/12t Delivery Truck.vecto diff --git a/VectoCoreTest/TestData/Jobs/24t Coach EngineOnly.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/24t Coach EngineOnly.vecto similarity index 100% rename from VectoCoreTest/TestData/Jobs/24t Coach EngineOnly.vecto rename to VectoCore/VectoCoreTest/TestData/Jobs/24t Coach EngineOnly.vecto diff --git a/VectoCoreTest/TestData/Jobs/24t Coach.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/24t Coach.vecto similarity index 100% rename from VectoCoreTest/TestData/Jobs/24t Coach.vecto rename to VectoCore/VectoCoreTest/TestData/Jobs/24t Coach.vecto diff --git a/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck.vecto similarity index 100% rename from VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck.vecto rename to VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck.vecto diff --git a/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck_invalid-JSON.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck_invalid-JSON.vecto similarity index 100% rename from VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck_invalid-JSON.vecto rename to VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck_invalid-JSON.vecto diff --git a/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck_wrong_AUX.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck_wrong_AUX.vecto similarity index 100% rename from VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck_wrong_AUX.vecto rename to VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck_wrong_AUX.vecto diff --git a/VectoCoreTest/TestData/Jobs/EngineOnlyJob.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/EngineOnlyJob.vecto similarity index 100% rename from VectoCoreTest/TestData/Jobs/EngineOnlyJob.vecto rename to VectoCore/VectoCoreTest/TestData/Jobs/EngineOnlyJob.vecto diff --git a/VectoCoreTest/TestData/Jobs/job-report.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/job-report.vecto similarity index 100% rename from VectoCoreTest/TestData/Jobs/job-report.vecto rename to VectoCore/VectoCoreTest/TestData/Jobs/job-report.vecto diff --git a/VectoCoreTest/TestData/MeasuredSpeed/ATEGO_chassis_dyno_rural.vdri b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/ATEGO_chassis_dyno_rural.vdri similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/ATEGO_chassis_dyno_rural.vdri rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/ATEGO_chassis_dyno_rural.vdri diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Alternator.vaux b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Alternator.vaux similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Alternator.vaux rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Alternator.vaux diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Demo_ChassisDyno.v2.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Demo_ChassisDyno.v2.vsum similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Demo_ChassisDyno.v2.vsum rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Demo_ChassisDyno.v2.vsum diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Demo_TestTrackCycle.v2.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Demo_TestTrackCycle.v2.vsum similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Demo_TestTrackCycle.v2.vsum rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Demo_TestTrackCycle.v2.vsum diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Driver.vacc b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Driver.vacc similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Driver.vacc rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Driver.vacc diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Engine.veng b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Engine.veng similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Engine.veng rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Engine.veng diff --git a/VectoCoreTest/TestData/MeasuredSpeed/FuelConsumption.vmap b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/FuelConsumption.vmap similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/FuelConsumption.vmap rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/FuelConsumption.vmap diff --git a/VectoCoreTest/TestData/MeasuredSpeed/FullLoadCurve.vfld b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/FullLoadCurve.vfld similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/FullLoadCurve.vfld rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/FullLoadCurve.vfld diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Gear_Axle_loss.vtlm b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Gear_Axle_loss.vtlm similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Gear_Axle_loss.vtlm rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Gear_Axle_loss.vtlm diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Gear_Direct_loss.vtlm b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Gear_Direct_loss.vtlm similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Gear_Direct_loss.vtlm rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Gear_Direct_loss.vtlm diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Gear_Indirect_loss.vtlm b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Gear_Indirect_loss.vtlm similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Gear_Indirect_loss.vtlm rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Gear_Indirect_loss.vtlm diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Gearbox.vgbx b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Gearbox.vgbx similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Gearbox.vgbx rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Gearbox.vgbx diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed.vdri b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed.vdri similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed.vdri rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed.vdri diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed.vecto b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed.vecto similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed.vecto rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed.vecto diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedAux.vdri b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedAux.vdri similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedAux.vdri rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedAux.vdri diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedAux.vecto b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedAux.vecto similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedAux.vecto rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedAux.vecto diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGear.vecto b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGear.vecto similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGear.vecto rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGear.vecto diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGearAux.vecto b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGearAux.vecto similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGearAux.vecto rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGearAux.vecto diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGearVair.vecto b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGearVair.vecto similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGearVair.vecto rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGearVair.vecto diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGearVairAux.vecto b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGearVairAux.vecto similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGearVairAux.vecto rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedGearVairAux.vecto diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVair.vdri b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVair.vdri similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVair.vdri rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVair.vdri diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVair.vecto b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVair.vecto similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVair.vecto rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVair.vecto diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairAux.vdri b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairAux.vdri similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairAux.vdri rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairAux.vdri diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairAux.vecto b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairAux.vecto similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairAux.vecto rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairAux.vecto diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairBack.vdri b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairBack.vdri similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairBack.vdri rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairBack.vdri diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairBack.vecto b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairBack.vecto similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairBack.vecto rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairBack.vecto diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairFront.vdri b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairFront.vdri similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairFront.vdri rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairFront.vdri diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairFront.vecto b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairFront.vecto similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairFront.vecto rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairFront.vecto diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairNoWind.vdri b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairNoWind.vdri similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairNoWind.vdri rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairNoWind.vdri diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairNoWind.vecto b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairNoWind.vecto similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairNoWind.vecto rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeedVairNoWind.vecto diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed_Gear_Rural.vdri b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed_Gear_Rural.vdri similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed_Gear_Rural.vdri rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed_Gear_Rural.vdri diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed_Gear_Rural_Aux.vdri b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed_Gear_Rural_Aux.vdri similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed_Gear_Rural_Aux.vdri rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed_Gear_Rural_Aux.vdri diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed_Gear_Rural_Vair.vdri b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed_Gear_Rural_Vair.vdri similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed_Gear_Rural_Vair.vdri rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed_Gear_Rural_Vair.vdri diff --git a/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed_Gear_Rural_VairAux.vdri b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed_Gear_Rural_VairAux.vdri similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed_Gear_Rural_VairAux.vdri rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/MeasuredSpeed_Gear_Rural_VairAux.vdri diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux_MeasuredSpeed_Gear_Rural_VairAux.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux_MeasuredSpeed_Gear_Rural_VairAux.vmod similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux_MeasuredSpeed_Gear_Rural_VairAux.vmod rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux_MeasuredSpeed_Gear_Rural_VairAux.vmod diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair_MeasuredSpeed_Gear_Rural_Vair.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair_MeasuredSpeed_Gear_Rural_Vair.vmod similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair_MeasuredSpeed_Gear_Rural_Vair.vmod rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair_MeasuredSpeed_Gear_Rural_Vair.vmod diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair_MeasuredSpeedVair.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair_MeasuredSpeedVair.vmod similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair_MeasuredSpeedVair.vmod rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair_MeasuredSpeedVair.vmod diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed_MeasuredSpeed.vmod b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed_MeasuredSpeed.vmod similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed_MeasuredSpeed.vmod rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed_MeasuredSpeed.vmod diff --git a/VectoCoreTest/TestData/MeasuredSpeed/ShiftPolygons.vgbs b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/ShiftPolygons.vgbs similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/ShiftPolygons.vgbs rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/ShiftPolygons.vgbs diff --git a/VectoCoreTest/TestData/MeasuredSpeed/VairBeta.vcdb b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/VairBeta.vcdb similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/VairBeta.vcdb rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/VairBeta.vcdb diff --git a/VectoCoreTest/TestData/MeasuredSpeed/VairBetaFull.vcdb b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/VairBetaFull.vcdb similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/VairBetaFull.vcdb rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/VairBetaFull.vcdb diff --git a/VectoCoreTest/TestData/MeasuredSpeed/Vehicle.vveh b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Vehicle.vveh similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/Vehicle.vveh rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Vehicle.vveh diff --git a/VectoCoreTest/TestData/MeasuredSpeed/VehicleVair.vveh b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/VehicleVair.vveh similarity index 100% rename from VectoCoreTest/TestData/MeasuredSpeed/VehicleVair.vveh rename to VectoCore/VectoCoreTest/TestData/MeasuredSpeed/VehicleVair.vveh diff --git a/VectoCoreTest/TestData/Pwheel/Atego.vveh b/VectoCore/VectoCoreTest/TestData/Pwheel/Atego.vveh similarity index 100% rename from VectoCoreTest/TestData/Pwheel/Atego.vveh rename to VectoCore/VectoCoreTest/TestData/Pwheel/Atego.vveh diff --git a/VectoCoreTest/TestData/Pwheel/Atego_ges.v2.vsig b/VectoCore/VectoCoreTest/TestData/Pwheel/Atego_ges.v2.vsig similarity index 100% rename from VectoCoreTest/TestData/Pwheel/Atego_ges.v2.vsig rename to VectoCore/VectoCoreTest/TestData/Pwheel/Atego_ges.v2.vsig diff --git a/VectoCoreTest/TestData/Pwheel/G_85-6_6_7-0_17.vgbx b/VectoCore/VectoCoreTest/TestData/Pwheel/G_85-6_6_7-0_17.vgbx similarity index 100% rename from VectoCoreTest/TestData/Pwheel/G_85-6_6_7-0_17.vgbx rename to VectoCore/VectoCoreTest/TestData/Pwheel/G_85-6_6_7-0_17.vgbx diff --git a/VectoCoreTest/TestData/Pwheel/Gear2_pt1_rep1_actual.vdri b/VectoCore/VectoCoreTest/TestData/Pwheel/Gear2_pt1_rep1_actual.vdri similarity index 100% rename from VectoCoreTest/TestData/Pwheel/Gear2_pt1_rep1_actual.vdri rename to VectoCore/VectoCoreTest/TestData/Pwheel/Gear2_pt1_rep1_actual.vdri diff --git a/VectoCoreTest/TestData/Pwheel/OM906.veng b/VectoCore/VectoCoreTest/TestData/Pwheel/OM906.veng similarity index 100% rename from VectoCoreTest/TestData/Pwheel/OM906.veng rename to VectoCore/VectoCoreTest/TestData/Pwheel/OM906.veng diff --git a/VectoCoreTest/TestData/Pwheel/Pwheel.vecto b/VectoCore/VectoCoreTest/TestData/Pwheel/Pwheel.vecto similarity index 100% rename from VectoCoreTest/TestData/Pwheel/Pwheel.vecto rename to VectoCore/VectoCoreTest/TestData/Pwheel/Pwheel.vecto diff --git a/VectoCoreTest/TestData/Pwheel/Pwheel_ultimate.vecto b/VectoCore/VectoCoreTest/TestData/Pwheel/Pwheel_ultimate.vecto similarity index 100% rename from VectoCoreTest/TestData/Pwheel/Pwheel_ultimate.vecto rename to VectoCore/VectoCoreTest/TestData/Pwheel/Pwheel_ultimate.vecto diff --git a/VectoCoreTest/TestData/Pwheel/RD_#1_Pwheel_AuxStd.vdri b/VectoCore/VectoCoreTest/TestData/Pwheel/RD_#1_Pwheel_AuxStd.vdri similarity index 100% rename from VectoCoreTest/TestData/Pwheel/RD_#1_Pwheel_AuxStd.vdri rename to VectoCore/VectoCoreTest/TestData/Pwheel/RD_#1_Pwheel_AuxStd.vdri diff --git a/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum similarity index 100% rename from VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum rename to VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum diff --git a/VectoCoreTest/TestData/Pwheel/Results/Pwheel_Gear2_pt1_rep1_actual.vmod b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_Gear2_pt1_rep1_actual.vmod similarity index 100% rename from VectoCoreTest/TestData/Pwheel/Results/Pwheel_Gear2_pt1_rep1_actual.vmod rename to VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_Gear2_pt1_rep1_actual.vmod diff --git a/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum similarity index 100% rename from VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum rename to VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum diff --git a/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod similarity index 100% rename from VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod rename to VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod diff --git a/VectoCoreTest/TestData/Pwheel/ShiftPolygons_o9061750850E4.vgbs b/VectoCore/VectoCoreTest/TestData/Pwheel/ShiftPolygons_o9061750850E4.vgbs similarity index 100% rename from VectoCoreTest/TestData/Pwheel/ShiftPolygons_o9061750850E4.vgbs rename to VectoCore/VectoCoreTest/TestData/Pwheel/ShiftPolygons_o9061750850E4.vgbs diff --git a/VectoCoreTest/TestData/Pwheel/Truck.vacc b/VectoCore/VectoCoreTest/TestData/Pwheel/Truck.vacc similarity index 100% rename from VectoCoreTest/TestData/Pwheel/Truck.vacc rename to VectoCore/VectoCoreTest/TestData/Pwheel/Truck.vacc diff --git a/VectoCoreTest/TestData/Pwheel/axle_losses_r390_80_serie_1306.vtlm b/VectoCore/VectoCoreTest/TestData/Pwheel/axle_losses_r390_80_serie_1306.vtlm similarity index 100% rename from VectoCoreTest/TestData/Pwheel/axle_losses_r390_80_serie_1306.vtlm rename to VectoCore/VectoCoreTest/TestData/Pwheel/axle_losses_r390_80_serie_1306.vtlm diff --git a/VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_1.vtlm b/VectoCore/VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_1.vtlm similarity index 100% rename from VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_1.vtlm rename to VectoCore/VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_1.vtlm diff --git a/VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_2.vtlm b/VectoCore/VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_2.vtlm similarity index 100% rename from VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_2.vtlm rename to VectoCore/VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_2.vtlm diff --git a/VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_3.vtlm b/VectoCore/VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_3.vtlm similarity index 100% rename from VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_3.vtlm rename to VectoCore/VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_3.vtlm diff --git a/VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_4.vtlm b/VectoCore/VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_4.vtlm similarity index 100% rename from VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_4.vtlm rename to VectoCore/VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_4.vtlm diff --git a/VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_5.vtlm b/VectoCore/VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_5.vtlm similarity index 100% rename from VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_5.vtlm rename to VectoCore/VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_5.vtlm diff --git a/VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_6.vtlm b/VectoCore/VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_6.vtlm similarity index 100% rename from VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_6.vtlm rename to VectoCore/VectoCoreTest/TestData/Pwheel/losses_g85_6_6696_0728_1401_loss_6.vtlm diff --git a/VectoCoreTest/TestData/Pwheel/o9061750850E4.vfld b/VectoCore/VectoCoreTest/TestData/Pwheel/o9061750850E4.vfld similarity index 100% rename from VectoCoreTest/TestData/Pwheel/o9061750850E4.vfld rename to VectoCore/VectoCoreTest/TestData/Pwheel/o9061750850E4.vfld diff --git a/VectoCoreTest/TestData/Pwheel/om9062101120_e4e5_b7c_sl2499_20110727.vmap b/VectoCore/VectoCoreTest/TestData/Pwheel/om9062101120_e4e5_b7c_sl2499_20110727.vmap similarity index 100% rename from VectoCoreTest/TestData/Pwheel/om9062101120_e4e5_b7c_sl2499_20110727.vmap rename to VectoCore/VectoCoreTest/TestData/Pwheel/om9062101120_e4e5_b7c_sl2499_20110727.vmap diff --git a/VectoCoreTest/TestData/Results/Declaration/40t_Long_Haul_Truck.vsum b/VectoCore/VectoCoreTest/TestData/Results/Declaration/40t_Long_Haul_Truck.vsum similarity index 100% rename from VectoCoreTest/TestData/Results/Declaration/40t_Long_Haul_Truck.vsum rename to VectoCore/VectoCoreTest/TestData/Results/Declaration/40t_Long_Haul_Truck.vsum diff --git a/VectoCoreTest/TestData/Results/Declaration/40t_Long_Haul_Truck_Regional_Delivery_Reference Loading.vmod b/VectoCore/VectoCoreTest/TestData/Results/Declaration/40t_Long_Haul_Truck_Regional_Delivery_Reference Loading.vmod similarity index 100% rename from VectoCoreTest/TestData/Results/Declaration/40t_Long_Haul_Truck_Regional_Delivery_Reference Loading.vmod rename to VectoCore/VectoCoreTest/TestData/Results/Declaration/40t_Long_Haul_Truck_Regional_Delivery_Reference Loading.vmod diff --git a/VectoCoreTest/TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_10Hz.csv b/VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_10Hz.csv similarity index 100% rename from VectoCoreTest/TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_10Hz.csv rename to VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_10Hz.csv diff --git a/VectoCoreTest/TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_10Hz_IncPT1.csv b/VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_10Hz_IncPT1.csv similarity index 100% rename from VectoCoreTest/TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_10Hz_IncPT1.csv rename to VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_10Hz_IncPT1.csv diff --git a/VectoCoreTest/TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_1Hz.csv b/VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_1Hz.csv similarity index 100% rename from VectoCoreTest/TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_1Hz.csv rename to VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_1Hz.csv diff --git a/VectoCoreTest/TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_2Hz.csv b/VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_2Hz.csv similarity index 100% rename from VectoCoreTest/TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_2Hz.csv rename to VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_2Hz.csv diff --git a/VectoCoreTest/TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_varHz.csv b/VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_varHz.csv similarity index 100% rename from VectoCoreTest/TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_varHz.csv rename to VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/EngineFLJ_1000rpm_varHz.csv diff --git a/VectoCoreTest/TestData/Results/EngineFullLoadJumps/FLD variable time steps martin.xlsx b/VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/FLD variable time steps martin.xlsx similarity index 100% rename from VectoCoreTest/TestData/Results/EngineFullLoadJumps/FLD variable time steps martin.xlsx rename to VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/FLD variable time steps martin.xlsx diff --git a/VectoCoreTest/TestData/Results/EngineFullLoadJumps/VectoLastsprung.xlsx b/VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/VectoLastsprung.xlsx similarity index 100% rename from VectoCoreTest/TestData/Results/EngineFullLoadJumps/VectoLastsprung.xlsx rename to VectoCore/VectoCoreTest/TestData/Results/EngineFullLoadJumps/VectoLastsprung.xlsx diff --git a/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach.vsum b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach.vsum similarity index 100% rename from VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach.vsum rename to VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach.vsum diff --git a/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach.vsum.json b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach.vsum.json similarity index 100% rename from VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach.vsum.json rename to VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach.vsum.json diff --git a/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach_Engine Only1.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach_Engine Only1.vmod similarity index 100% rename from VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach_Engine Only1.vmod rename to VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach_Engine Only1.vmod diff --git a/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach_Engine Only2.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach_Engine Only2.vmod similarity index 100% rename from VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach_Engine Only2.vmod rename to VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach_Engine Only2.vmod diff --git a/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach_Engine Only3.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach_Engine Only3.vmod similarity index 100% rename from VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach_Engine Only3.vmod rename to VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach_Engine Only3.vmod diff --git a/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnly short.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnly short.vmod similarity index 100% rename from VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnly short.vmod rename to VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnly short.vmod diff --git a/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnly.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnly.vmod similarity index 100% rename from VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnly.vmod rename to VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnly.vmod diff --git a/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnlyFullLoad.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnlyFullLoad.vmod similarity index 100% rename from VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnlyFullLoad.vmod rename to VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnlyFullLoad.vmod diff --git a/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnlyPaux.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnlyPaux.vmod similarity index 100% rename from VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnlyPaux.vmod rename to VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnlyPaux.vmod diff --git a/VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck.vsum b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck.vsum similarity index 100% rename from VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck.vsum rename to VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck.vsum diff --git a/VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck_Long_Haul_Empty Loading.vmod b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck_Long_Haul_Empty Loading.vmod similarity index 100% rename from VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck_Long_Haul_Empty Loading.vmod rename to VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/40t_Long_Haul_Truck_Long_Haul_Empty Loading.vmod diff --git a/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum similarity index 100% rename from VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum rename to VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum diff --git a/VectoCoreTest/TestData/Results/Engineering/24t Coach.vsum b/VectoCore/VectoCoreTest/TestData/Results/Engineering/24t Coach.vsum similarity index 100% rename from VectoCoreTest/TestData/Results/Engineering/24t Coach.vsum rename to VectoCore/VectoCoreTest/TestData/Results/Engineering/24t Coach.vsum diff --git a/VectoCoreTest/TestData/Results/Engineering/24t Coach_Coach_24t_xshort.vmod b/VectoCore/VectoCoreTest/TestData/Results/Engineering/24t Coach_Coach_24t_xshort.vmod similarity index 100% rename from VectoCoreTest/TestData/Results/Engineering/24t Coach_Coach_24t_xshort.vmod rename to VectoCore/VectoCoreTest/TestData/Results/Engineering/24t Coach_Coach_24t_xshort.vmod diff --git a/VectoCoreTest/TestData/Results/Integration/24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod b/VectoCore/VectoCoreTest/TestData/Results/Integration/24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod similarity index 100% rename from VectoCoreTest/TestData/Results/Integration/24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod rename to VectoCore/VectoCoreTest/TestData/Results/Integration/24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod diff --git a/VectoCoreTest/TestData/Results/Integration/Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod b/VectoCore/VectoCoreTest/TestData/Results/Integration/Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod similarity index 100% rename from VectoCoreTest/TestData/Results/Integration/Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod rename to VectoCore/VectoCoreTest/TestData/Results/Integration/Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod diff --git a/VectoCoreTest/TestData/Results/Integration/job.vsum b/VectoCore/VectoCoreTest/TestData/Results/Integration/job.vsum similarity index 100% rename from VectoCoreTest/TestData/Results/Integration/job.vsum rename to VectoCore/VectoCoreTest/TestData/Results/Integration/job.vsum diff --git a/VectoCoreTest/TestData/Results/Integration/job_1-Gear-Test-dist.vmod b/VectoCore/VectoCoreTest/TestData/Results/Integration/job_1-Gear-Test-dist.vmod similarity index 100% rename from VectoCoreTest/TestData/Results/Integration/job_1-Gear-Test-dist.vmod rename to VectoCore/VectoCoreTest/TestData/Results/Integration/job_1-Gear-Test-dist.vmod diff --git a/VectoCoreTest/TestData/job.vecto b/VectoCore/VectoCoreTest/TestData/job.vecto similarity index 100% rename from VectoCoreTest/TestData/job.vecto rename to VectoCore/VectoCoreTest/TestData/job.vecto diff --git a/VectoCoreTest/Utils/AssertHelper.cs b/VectoCore/VectoCoreTest/Utils/AssertHelper.cs similarity index 100% rename from VectoCoreTest/Utils/AssertHelper.cs rename to VectoCore/VectoCoreTest/Utils/AssertHelper.cs diff --git a/VectoCoreTest/Utils/DelauneyMapTest.cs b/VectoCore/VectoCoreTest/Utils/DelauneyMapTest.cs similarity index 100% rename from VectoCoreTest/Utils/DelauneyMapTest.cs rename to VectoCore/VectoCoreTest/Utils/DelauneyMapTest.cs diff --git a/VectoCoreTest/Utils/DoubleExtensionMethodTest.cs b/VectoCore/VectoCoreTest/Utils/DoubleExtensionMethodTest.cs similarity index 100% rename from VectoCoreTest/Utils/DoubleExtensionMethodTest.cs rename to VectoCore/VectoCoreTest/Utils/DoubleExtensionMethodTest.cs diff --git a/VectoCoreTest/Utils/GraphWriter.cs b/VectoCore/VectoCoreTest/Utils/GraphWriter.cs similarity index 100% rename from VectoCoreTest/Utils/GraphWriter.cs rename to VectoCore/VectoCoreTest/Utils/GraphWriter.cs diff --git a/VectoCoreTest/Utils/InputDataHelper.cs b/VectoCore/VectoCoreTest/Utils/InputDataHelper.cs similarity index 100% rename from VectoCoreTest/Utils/InputDataHelper.cs rename to VectoCore/VectoCoreTest/Utils/InputDataHelper.cs diff --git a/VectoCoreTest/Utils/MockAuxiliaryDemand.cs b/VectoCore/VectoCoreTest/Utils/MockAuxiliaryDemand.cs similarity index 100% rename from VectoCoreTest/Utils/MockAuxiliaryDemand.cs rename to VectoCore/VectoCoreTest/Utils/MockAuxiliaryDemand.cs diff --git a/VectoCoreTest/Utils/MockBrakes.cs b/VectoCore/VectoCoreTest/Utils/MockBrakes.cs similarity index 100% rename from VectoCoreTest/Utils/MockBrakes.cs rename to VectoCore/VectoCoreTest/Utils/MockBrakes.cs diff --git a/VectoCoreTest/Utils/MockDriver.cs b/VectoCore/VectoCoreTest/Utils/MockDriver.cs similarity index 100% rename from VectoCoreTest/Utils/MockDriver.cs rename to VectoCore/VectoCoreTest/Utils/MockDriver.cs diff --git a/VectoCoreTest/Utils/MockEngineDataProvider.cs b/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs similarity index 100% rename from VectoCoreTest/Utils/MockEngineDataProvider.cs rename to VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs diff --git a/VectoCoreTest/Utils/MockGearbox.cs b/VectoCore/VectoCoreTest/Utils/MockGearbox.cs similarity index 100% rename from VectoCoreTest/Utils/MockGearbox.cs rename to VectoCore/VectoCoreTest/Utils/MockGearbox.cs diff --git a/VectoCoreTest/Utils/MockModalDataContainer.cs b/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs similarity index 100% rename from VectoCoreTest/Utils/MockModalDataContainer.cs rename to VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs diff --git a/VectoCoreTest/Utils/MockPorts.cs b/VectoCore/VectoCoreTest/Utils/MockPorts.cs similarity index 100% rename from VectoCoreTest/Utils/MockPorts.cs rename to VectoCore/VectoCoreTest/Utils/MockPorts.cs diff --git a/VectoCoreTest/Utils/MockSimulationDataFactory.cs b/VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs similarity index 100% rename from VectoCoreTest/Utils/MockSimulationDataFactory.cs rename to VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs diff --git a/VectoCoreTest/Utils/MockVairVehicleContainer.cs b/VectoCore/VectoCoreTest/Utils/MockVairVehicleContainer.cs similarity index 100% rename from VectoCoreTest/Utils/MockVairVehicleContainer.cs rename to VectoCore/VectoCoreTest/Utils/MockVairVehicleContainer.cs diff --git a/VectoCoreTest/Utils/MockVehicle.cs b/VectoCore/VectoCoreTest/Utils/MockVehicle.cs similarity index 100% rename from VectoCoreTest/Utils/MockVehicle.cs rename to VectoCore/VectoCoreTest/Utils/MockVehicle.cs diff --git a/VectoCoreTest/Utils/Port.cs b/VectoCore/VectoCoreTest/Utils/Port.cs similarity index 100% rename from VectoCoreTest/Utils/Port.cs rename to VectoCore/VectoCoreTest/Utils/Port.cs diff --git a/VectoCoreTest/Utils/ResultFileHelper.cs b/VectoCore/VectoCoreTest/Utils/ResultFileHelper.cs similarity index 100% rename from VectoCoreTest/Utils/ResultFileHelper.cs rename to VectoCore/VectoCoreTest/Utils/ResultFileHelper.cs diff --git a/VectoCoreTest/Utils/SITest.cs b/VectoCore/VectoCoreTest/Utils/SITest.cs similarity index 100% rename from VectoCoreTest/Utils/SITest.cs rename to VectoCore/VectoCoreTest/Utils/SITest.cs diff --git a/VectoCoreTest/Utils/VectoMathTest.cs b/VectoCore/VectoCoreTest/Utils/VectoMathTest.cs similarity index 100% rename from VectoCoreTest/Utils/VectoMathTest.cs rename to VectoCore/VectoCoreTest/Utils/VectoMathTest.cs diff --git a/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj similarity index 100% rename from VectoCoreTest/VectoCoreTest.csproj rename to VectoCore/VectoCoreTest/VectoCoreTest.csproj diff --git a/VectoCoreTest/app.config b/VectoCore/VectoCoreTest/app.config similarity index 100% rename from VectoCoreTest/app.config rename to VectoCore/VectoCoreTest/app.config diff --git a/VectoCoreTest/default.runsettings b/VectoCore/VectoCoreTest/default.runsettings similarity index 100% rename from VectoCoreTest/default.runsettings rename to VectoCore/VectoCoreTest/default.runsettings diff --git a/VectoCoreTest/packages.config b/VectoCore/VectoCoreTest/packages.config similarity index 100% rename from VectoCoreTest/packages.config rename to VectoCore/VectoCoreTest/packages.config