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

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