Merge index/storage in one tree