Rename timer functions.
Improve test stub generation.
Moved c-headers to sub-directories.
Moved cpp-headers to sub-directories.
Fix include order.
Merge branch 'master' of github.com:doobry-org/doobry

Merge upstream changes.