Revert "Trimmed the branch to only the timestamp_tools sub directory"

This reverts commit e17e5031c96969e8781bf52f197f783007b00426.
Rebase from 'upstream'
Trimmed the branch to only the timestamp_tools sub directory