Also move BBlockBufferPoolNoLock into BHPKG namespace with the other classes. Not sure why it wasn't there before.
It uses sub-namespace BPackage::BHPKG::V1. Unlike the one for the current format version, the V1 version of BPackageInfoContentHandler lives in BHPKG(::V1) sub-namespace and is private.