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

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