Moved to ZT-specific package.
Some changes for our use in LR, will clean up in next commit.