diff --git a/Tools/AuxMerge/README.md b/Tools/AuxMerge/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..071ebb833a8aee43673233c556444fdbeb73de72
--- /dev/null
+++ b/Tools/AuxMerge/README.md
@@ -0,0 +1,29 @@
+## Scripts for Merging Ricardo's sources to VECTO-core.
+#
+# by ankostis
+
+The merging of VECTO-AUX <--> VECTO-Core has happenned in these stages:
+
+1. Identify fork-point in VECTO-code's history
+ (see `git-rewrite.sh`):
+
+ milistone/2.0.4-beta
+
+2. FIXUP VECT-AUX sources to be similar to the above VECTO-core sources
+ (see `git-rewrite.sh`).
+
+
+3. Merge the rewritten VECTO-AUX-sources into identified VECTO_Core version
+ (see `rebase_aux.sh`).
+
+4. Rebase re-written branch in step 2 onto merged-commit in step-3 (with many manual actions)
+ (see `rebase_aux.sh`).
+
+5. Append these tools into sources.
+
+6. NEXT steps:
+ - Await Ricardo's fixes (TCs failing, aux-model discrepancy).
+ - Merge with later milestones, till latest 2.2.
+
+
+That's it.
\ No newline at end of file
diff --git a/Tools/AuxMerge/Ricardo-FilelList-root_vecto-mv_aux.tree_filter.sh.txt b/Tools/AuxMerge/Ricardo-FilelList-root_vecto-mv_aux.tree_filter.sh.txt
new file mode 100644
index 0000000000000000000000000000000000000000..bdc92459952af2edab9db8a07048b62bfc436fec
--- /dev/null
+++ b/Tools/AuxMerge/Ricardo-FilelList-root_vecto-mv_aux.tree_filter.sh.txt
@@ -0,0 +1,164 @@
+./vecto-aux
+./vecto-aux/AUXUITEST
+./vecto-aux/AUXUITEST/My Project
+./vecto-aux/Launch
+./vecto-aux/Launch/My Project
+./vecto-aux/packages
+./vecto-aux/packages/NUnit.2.6.2
+./vecto-aux/packages/NUnit.2.6.2/lib
+./vecto-aux/VectoAuxiliaries
+./vecto-aux/VectoAuxiliaries/3rdPartyLibraries
+./vecto-aux/VectoAuxiliaries/bin
+./vecto-aux/VectoAuxiliaries/bin/Debug
+./vecto-aux/VectoAuxiliaries/DownstreamModules
+./vecto-aux/VectoAuxiliaries/Electrics
+./vecto-aux/VectoAuxiliaries/Hvac
+./vecto-aux/VectoAuxiliaries/Images
+./vecto-aux/VectoAuxiliaries/My Project
+./vecto-aux/VectoAuxiliaries/obj
+./vecto-aux/VectoAuxiliaries/obj/Debug
+./vecto-aux/VectoAuxiliaries/obj/Debug/TempPE
+./vecto-aux/VectoAuxiliaries/Pneumatics
+./vecto-aux/VectoAuxiliaries/Resources
+./vecto-aux/VectoAuxiliaries/UI
+./vecto-aux/VectoAuxiliariesTests
+./vecto-aux/VectoAuxiliariesTests/3rdParty
+./vecto-aux/VectoAuxiliariesTests/bin
+./vecto-aux/VectoAuxiliariesTests/bin/Debug
+./vecto-aux/VectoAuxiliariesTests/IntegrationTests
+./vecto-aux/VectoAuxiliariesTests/Mocks
+./vecto-aux/VectoAuxiliariesTests/My Project
+./vecto-aux/VectoAuxiliariesTests/obj
+./vecto-aux/VectoAuxiliariesTests/obj/Debug
+./vecto-aux/VectoAuxiliariesTests/obj/Debug/TempPE
+./vecto-aux/VectoAuxiliariesTests/TestFiles
+./vecto-aux/VectoAuxiliariesTests/UnitTests
+./vecto-sim
+./vecto-sim/AdvancedAuxiliaryInterfaces
+./vecto-sim/AdvancedAuxiliaryInterfaces/bin
+./vecto-sim/AdvancedAuxiliaryInterfaces/bin/Debug
+./vecto-sim/AdvancedAuxiliaryInterfaces/My Project
+./vecto-sim/AdvancedAuxiliaryInterfaces/obj
+./vecto-sim/AdvancedAuxiliaryInterfaces/obj/Debug
+./vecto-sim/AdvancedAuxiliaryInterfaces/obj/Debug/TempPE
+./vecto-sim/AuxillaryTestHarness
+./vecto-sim/AuxillaryTestHarness/Images
+./vecto-sim/AuxillaryTestHarness/My Project
+./vecto-sim/AuxillaryTestHarness/My Project/DataSources
+./vecto-sim/AuxillaryTestHarness/UI
+./vecto-sim/Developer Guide
+./vecto-sim/HVACTOOL
+./vecto-sim/HVACTOOL/My Project
+./vecto-sim/packages
+./vecto-sim/packages/Moq.4.2.1409.1722
+./vecto-sim/packages/Moq.4.2.1409.1722/lib
+./vecto-sim/packages/Moq.4.2.1409.1722/lib/net35
+./vecto-sim/packages/Moq.4.2.1409.1722/lib/net40
+./vecto-sim/packages/Moq.4.2.1409.1722/lib/sl4
+./vecto-sim/packages/Newtonsoft.Json.6.0.6
+./vecto-sim/packages/Newtonsoft.Json.6.0.6/lib
+./vecto-sim/packages/Newtonsoft.Json.6.0.6/lib/net20
+./vecto-sim/packages/Newtonsoft.Json.6.0.6/lib/net35
+./vecto-sim/packages/Newtonsoft.Json.6.0.6/lib/net40
+./vecto-sim/packages/Newtonsoft.Json.6.0.6/lib/net45
+./vecto-sim/packages/Newtonsoft.Json.6.0.6/lib/netcore45
+./vecto-sim/packages/Newtonsoft.Json.6.0.6/lib/portable-net40+sl5+wp80+win8+wpa81
+./vecto-sim/packages/Newtonsoft.Json.6.0.6/lib/portable-net45+wp80+win8+wpa81+aspnetcore50
+./vecto-sim/packages/Newtonsoft.Json.6.0.6/tools
+./vecto-sim/packages/NUnit.2.6.2
+./vecto-sim/packages/NUnit.2.6.2/lib
+./vecto-sim/packages/NUnit.2.6.3
+./vecto-sim/packages/NUnit.2.6.3/lib
+./vecto-sim/packages/NUnitTestAdapter.1.2
+./vecto-sim/packages/NUnitTestAdapter.1.2/lib
+./vecto-sim/packages/NUnitTestAdapter.1.2/tools
+./vecto-sim/packages/ValueInjecter.2.3.3
+./vecto-sim/packages/ValueInjecter.2.3.3/lib
+./vecto-sim/packages/ValueInjecter.2.3.3/lib/net35
+./vecto-sim/packages/ValueInjecter.2.3.3/lib/sl3
+./vecto-sim/Third Party Libraries
+./vecto-sim/Third Party Libraries/itextsharp
+./vecto-sim/Tools
+./vecto-sim/Tools/Ricardo
+./vecto-sim/Tools/Ricardo/BuildProcessTemplates
+./vecto-sim/Tools/Ricardo/PersistanceTB
+./vecto-sim/Tools/Ricardo/PersistanceTB/packages
+./vecto-sim/Tools/Ricardo/PersistanceTB/packages/Newtonsoft.Json.6.0.6
+./vecto-sim/Tools/Ricardo/PersistanceTB/packages/Newtonsoft.Json.6.0.6/lib
+./vecto-sim/Tools/Ricardo/PersistanceTB/packages/Newtonsoft.Json.6.0.6/lib/net20
+./vecto-sim/Tools/Ricardo/PersistanceTB/packages/Newtonsoft.Json.6.0.6/lib/net35
+./vecto-sim/Tools/Ricardo/PersistanceTB/packages/Newtonsoft.Json.6.0.6/lib/net40
+./vecto-sim/Tools/Ricardo/PersistanceTB/packages/Newtonsoft.Json.6.0.6/lib/net45
+./vecto-sim/Tools/Ricardo/PersistanceTB/packages/Newtonsoft.Json.6.0.6/lib/netcore45
+./vecto-sim/Tools/Ricardo/PersistanceTB/packages/Newtonsoft.Json.6.0.6/lib/portable-net40+sl5+wp80+win8+wpa81
+./vecto-sim/Tools/Ricardo/PersistanceTB/packages/Newtonsoft.Json.6.0.6/lib/portable-net45+wp80+win8+wpa81+aspnetcore50
+./vecto-sim/Tools/Ricardo/PersistanceTB/packages/Newtonsoft.Json.6.0.6/tools
+./vecto-sim/Tools/Ricardo/PersistanceTB/packages/NUnit.2.6.3
+./vecto-sim/Tools/Ricardo/PersistanceTB/packages/NUnit.2.6.3/lib
+./vecto-sim/Tools/Ricardo/PersistanceTB/packages/NUnitTestAdapter.1.2
+./vecto-sim/Tools/Ricardo/PersistanceTB/packages/NUnitTestAdapter.1.2/lib
+./vecto-sim/Tools/Ricardo/PersistanceTB/packages/NUnitTestAdapter.1.2/tools
+./vecto-sim/Tools/Ricardo/PersistanceTB/Persistance
+./vecto-sim/Tools/Ricardo/PersistanceTB/Persistance/Images
+./vecto-sim/Tools/Ricardo/PersistanceTB/Persistance/My Project
+./vecto-sim/Tools/Ricardo/PersistanceTB/PersistanceUnitTesting
+./vecto-sim/Tools/Ricardo/PersistanceTB/PersistanceUnitTesting/My Project
+./vecto-sim/User Manual
+./vecto-sim/User Manual/AAux
+./vecto-sim/User Manual/AAux/Pics
+./vecto-sim/User Manual/fileformat
+./vecto-sim/User Manual/fileformat/pics
+./vecto-sim/User Manual/general
+./vecto-sim/User Manual/general/pics
+./vecto-sim/User Manual/GUI
+./vecto-sim/User Manual/GUI/GUI_Calls
+./vecto-sim/User Manual/GUI/pics
+./vecto-sim/User Manual/GUI/pics/VECTO
+./vecto-sim/User Manual/GUI/VECTO-Editor_files
+./vecto-sim/User Manual/main
+./vecto-sim/User Manual/pics
+./vecto-sim/User Manual/pics/icons
+./vecto-sim/User Manual/pics/misc
+./vecto-sim/VECTO
+./vecto-sim/VECTO/bin
+./vecto-sim/VECTO/bin/Debug
+./vecto-sim/VECTO/File Browser
+./vecto-sim/VECTO/GUI
+./vecto-sim/VECTO/Input Files
+./vecto-sim/VECTO/Libraries
+./vecto-sim/VECTO/MODcalc
+./vecto-sim/VECTO/My Project
+./vecto-sim/VECTO/obj
+./vecto-sim/VECTO/obj/Debug
+./vecto-sim/VECTO/obj/Debug/TempPE
+./vecto-sim/VECTO/Release Files
+./vecto-sim/VECTO/Release Files/Declaration
+./vecto-sim/VECTO/Release Files/Declaration/MissionCycles
+./vecto-sim/VECTO/Release Files/Declaration/Reports
+./vecto-sim/VECTO/Release Files/Declaration/VACC
+./vecto-sim/VECTO/Release Files/Declaration/VAUX
+./vecto-sim/VECTO/Release Files/Declaration/VCDV
+./vecto-sim/VECTO/Release Files/Generic Vehicles
+./vecto-sim/VECTO/Release Files/Generic Vehicles/Declaration Mode
+./vecto-sim/VECTO/Release Files/Generic Vehicles/Declaration Mode/12t Delivery Truck
+./vecto-sim/VECTO/Release Files/Generic Vehicles/Declaration Mode/40t Long Haul Truck
+./vecto-sim/VECTO/Release Files/Generic Vehicles/Engineering Mode
+./vecto-sim/VECTO/Release Files/Generic Vehicles/Engineering Mode/12t Delivery Truck
+./vecto-sim/VECTO/Release Files/Generic Vehicles/Engineering Mode/24t Coach
+./vecto-sim/VECTO/Release Files/User Manual
+./vecto-sim/VECTO/Release Files/User Manual/AAux
+./vecto-sim/VECTO/Release Files/User Manual/AAux/Pics
+./vecto-sim/VECTO/Release Files/User Manual/fileformat
+./vecto-sim/VECTO/Release Files/User Manual/fileformat/pics
+./vecto-sim/VECTO/Release Files/User Manual/general
+./vecto-sim/VECTO/Release Files/User Manual/general/pics
+./vecto-sim/VECTO/Release Files/User Manual/GUI
+./vecto-sim/VECTO/Release Files/User Manual/GUI/GUI_Calls
+./vecto-sim/VECTO/Release Files/User Manual/GUI/pics
+./vecto-sim/VECTO/Release Files/User Manual/GUI/pics/VECTO
+./vecto-sim/VECTO/Release Files/User Manual/GUI/VECTO-Editor_files
+./vecto-sim/VECTO/Release Files/User Manual/main
+./vecto-sim/VECTO/Release Files/User Manual/pics
+./vecto-sim/VECTO/Release Files/User Manual/pics/icons
+./vecto-sim/VECTO/Release Files/User Manual/pics/misc
+./vecto-sim/VECTO/Resources
diff --git a/Tools/AuxMerge/cleanup_aux_history.tree_filter.sh b/Tools/AuxMerge/cleanup_aux_history.tree_filter.sh
new file mode 100644
index 0000000000000000000000000000000000000000..fc7ae2b0aa2aa61eb7dcdca8bdb03780b6eb7721
--- /dev/null
+++ b/Tools/AuxMerge/cleanup_aux_history.tree_filter.sh
@@ -0,0 +1,290 @@
+# cleanup_aux_history.tree_filter.sh:
+# A git tree-filter bash-script(cygwin) preparing Ricardo's repo to merge with VECTO-2.0 repo (central).
+#
+# It is used by the cmd::
+#
+# git filter-branch ${TMP_DIR:+-d $TMP_DIR} --prune-empty --tree-filter "$PWD/cleanup_aux_history-tree_filter.sh" Current
+#
+# Assumes a single repo having fetched branches from both repos:
+# - ricardo: cb11c45@Current
+#
+# by ankostis, 4-Dec-2015
+
+set -o errexit
+shopt -s globstar
+
+## /New Folder: A short-lived experiment.
+# Completely discarded from history.
+#
+rm -rf "New Folder"
+
+
+## /vecto-sim-ricardoaea: Original sources, never touched.
+# Completely discarded from history, to use originals.
+#
+rm -rf vecto-sim-ricardoaea
+
+if [ -d "Third Party Libraries" ]; then
+ mkdir -p packages
+ mv "Third Party Libraries/*" packages/.
+fi
+
+## /BuildProcessTemplates: Work-files needed once for commencing solution.
+# To be archived in /Tools.
+#
+if [ -d BuildProcessTemplates ]; then
+ mkdir -p Tools/Ricardo
+ mv BuildProcessTemplates Tools/Ricardo/.
+fi
+
+
+## /PersistanceTB: Work-files needed once not sure why?
+# To be archived in /Tools.
+#
+if [ -d PersistanceTB ]; then
+ mkdir -p Tools/Ricardo
+ mv PersistanceTB Tools/Ricardo/.
+fi
+
+
+## /VectoAuxiliaries: Development of `vecto-aux` started in this folder,
+# and eventually Dana Nurse moved with 5d6fafd2e5532a@auxmerge/VectoAuxiliariesTB_begin
+# on Tue Sep 16 13:25:00 2014 +0000: Created Branch.
+#
+# $ git show-ref --tags |grep VectoAuxiliaries
+# 5d6fafd2e5532ae6ae7554cb8d5375e313ac9be5 refs/tags/auxmerge/VectoAuxiliariesTB_begin
+# 80fd13a4b739a4cd6f53cfc1689a4b6986c27ce7 refs/tags/auxmerge/VectoAuxiliaries_end
+# 538e211c6566ce7c4a1737fecef24b3112f3cb0c refs/tags/auxmerge/VectoAuxiliaries_begin
+#
+# $ git log --oneline Current -- VectoAuxiliaries
+# 9192214 Remove TFS bindings
+# 96343b5 WIP
+# 121916b git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C1608
+# 80fd13a Adding HVAC Tests
+# ca9c088 git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C1602
+# 93fe88c Started HVAC Load Demand Tests
+# 7ef3936 Added HnacMap tests
+# 538e211 First Check-In ready for working with new contractor
+#
+# So attaching `VectoAuxiliaries` as predecessor of `vecto-aux`,
+# and ignore all later changes.
+# Specifically ignoring 96343b5 where Terry probably resurrected by mistake (temporarily)
+# development in this folder.
+#
+if [ -d VectoAuxiliaries -a ! -d vecto-aux ]; then
+ mv VectoAuxiliaries vecto-aux
+fi
+rm -rf VectoAuxiliaries
+
+## Remove TeamFoundationServer bindings.
+#
+rm -f **/*.vssscc **/*.vspscc
+for f in `find . -name '*.sln'`; do
+ res="`gawk '
+ START {del=0}
+ /GlobalSection\(TeamFoundationVersionControl/ {del=1}
+ del != 1 {print $0}
+ /EndGlobalSection/ {del=0}
+ ' $f`"
+ echo "$res" | unix2dos > $f
+done
+
+## Remove compiled artifacts.
+#
+find . -name bin -type d -print0|xargs -0 rm -rf
+
+## Ensure .gitignore
+if [ ! -f .gitignore ]; then
+ cat > .gitignore << EOF
+VECTO/bin/
+VECTO/obj/
+
+## From github on 15/5/2014: https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+build/
+bld/
+[Bb]in/
+[Oo]bj/
+
+# Roslyn cache directories
+*.ide/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+#NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding addin-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+## TODO: Comment the next line if you want to checkin your
+## web deploy settings but do note that will include unencrypted
+## passwords
+*.pubxml
+
+# NuGet Packages Directory
+packages/*
+## TODO: If the tool you use requires repositories.config
+## uncomment the next line
+#!packages/repositories.config
+
+# Enable "build/" folder in the NuGet Packages folder since
+# NuGet packages use it for MSBuild targets.
+# This line needs to be after the ignore of the build folder
+# (and the packages folder if the line above has been uncommented)
+!packages/build/
+
+# Windows Azure Build Output
+csx/
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+node_modules/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+EOF
+fi
\ No newline at end of file
diff --git a/Tools/AuxMerge/git-rewrite.sh b/Tools/AuxMerge/git-rewrite.sh
new file mode 100644
index 0000000000000000000000000000000000000000..a6133eb3ac1e47799d078812b0017adb4557bd93
--- /dev/null
+++ b/Tools/AuxMerge/git-rewrite.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+# Merge cb11c451816@Current branch from Ricardo's repo with ab66a68@RICARDO_FORK tag from VECTO-2.0 repo (central).
+#
+# NOTE: this script has run in small pieces, not all at once.
+
+set -o errexit
+
+
+function mark_original_branches {
+ git branch auxmerge/ricardo_original cb11c451816
+
+
+ ## Mark some important commits.
+ # See rewrite_aux_history-tree_filter.sh
+ #
+ git tag auxmerge/VectoAuxiliariesTB_begin 5d6fafd2e553 -f \
+ -m "Renaming of 'VectoAuxiliaries' --> 'VectoAuxiliariesTB'. "
+ git tag auxmerge/VectoAuxiliaries_end 80fd13a4b739 -f \
+ -m "Last 'valid' modifications of precursor to 'VectoAuxiliariesTB' folder (without 'TB' suffix)."
+ git tag auxmerge/VectoAuxiliaries_begin 538e211c6566 -f \
+ -m "Initial commit of precursor to 'VectoAuxiliariesTB' folder (without 'TB' suffix)."
+ git tag auxmerge/RICARDO_ROOT 57393fe -f
+ -m "First commit delivered by Ricardo."
+ git tag auxmerge/RICARDO_FORK ab66a68b7333cd8 -f \
+ -m "According to Dana@Ricardo email on 30/Apr/2015 they FORKed @2a006e6dacf5e7
+but JRC assumes they meant the next-one, not-merge commit:
+ ab66a68b7333cd8@milestone/2.0.4-beta.2
+"
+}
+
+function remove_git_backup {
+ rm -rf .git/refs/original # Clear git-backup to continue re-writting.
+}
+
+## Eliminate duplicate folders (mostly safe stuff).
+#
+# The TMP_DIR may point to some RAMDisk (i.e. for windows see ImDisk).
+#
+function cleanup_ricardo_sources {
+ #git checkout auxmerge/ricardo_original
+ #git checkout -b auxmerge/aux1.3-cleanup
+ git filter-branch ${TMP_DIR:+-d $TMP_DIR} \
+ --prune-empty \
+ --tree-filter "$PWD/cleanup_aux_history.tree_filter.sh"
+}
+
+
+## Move VECTO sources to root & vecto-aux-->AUX.
+#
+function reroot_vecto_sources {
+ #git checkout auxmerge/aux1.3-cleanup
+ #git checkout -b auxmerge/aux2.4-reroot_vecto
+ git filter-branch ${TMP_DIR:+-d $TMP_DIR} \
+ --prune-empty \
+ --tree-filter "$PWD/root_vecto-mv_aux.tree_filter.sh"
+}
+
+
+#git checkout Current
+#mark_original_branches
+
+#remove_git_backup
+#cleanup_ricardo_sources
+
+remove_git_backup
+reroot_vecto_sources
+
+## JOIN the 2 unrelated branches and
+# MANUALLY RESOLVE CONFLICTS
+#git branch auxmerge/aux3-rebased_on_fork
+#git checkout auxmerge/aux3-rebased_on_fork
+#git rebase auxmerge/RICARDO_FORK
\ No newline at end of file
diff --git a/Tools/AuxMerge/root_vecto-mv_aux.tree_filter.sh b/Tools/AuxMerge/root_vecto-mv_aux.tree_filter.sh
new file mode 100644
index 0000000000000000000000000000000000000000..f3f74765247cf382230d5d6185c5f9e3d1cd14fb
--- /dev/null
+++ b/Tools/AuxMerge/root_vecto-mv_aux.tree_filter.sh
@@ -0,0 +1,30 @@
+# root_vecto-mv_aux.tree_filter.sh:
+# A git tree-filter script preparing Ricardo's repo to merge with VECTO-2.0 repo (central).
+#
+# It is used by the cmd::
+#
+# git filter-branch ${TMP_DIR:+-d $TMP_DIR} --prune-empty --tree-filter "$PWD/root_vecto-mv_aux.tree_filter.sh" auxmerge/aux-reroot_vecto
+#
+# Assumes repo has been cleaned-up with cleanup_aux_history.tree_filter.sh
+#
+# by ankostis, 4-Dec-2015
+
+set -o errexit
+
+
+## /vecto-sim-ricardoaeaTB: VECTO-core modified by Ricardo
+# Move its contents to the root of the project.
+#
+if [ -d vecto-sim-ricardoaeaTB ]; then
+ rsync -ma vecto-sim-ricardoaeaTB/ .
+ rm -rf vecto-sim-ricardoaeaTB
+fi
+grep 'vecto-sim-ricardoaeaTB' -rlZ * | xargs -r0I XXX sed 's/vecto-sim-ricardoaeaTB\\//g' -i XXX
+
+## /VectoAuxiliaries-TB: AdvancedAUX UI and code
+# Rename it as `VectoAuxiliaries`.
+#
+if [ -d VectoAuxiliaries-TB ]; then
+ mv VectoAuxiliaries-TB/ VectoAuxiliaries
+fi
+grep 'VectoAuxiliaries-TB' -rlZ * | xargs -r0I XXX sed 's/..\\VectoAuxiliaries-TB/VectoAuxiliaries/g' -i XXX