Split ObjectStore into BucketOnDisk and ObjectOnDisk.