java: collapsing some packages, build fixes
cpp: Db -> Tsdb
Revert "cpp: Db -> Tsdb"

This reverts commit 99e64eb20cbfc571e2f45bb4015ceb792fbbe5ff.
Db -> Tsdbs
cpp: db -> tsdb