Minor. Since the implementation of CreateCStoreDatabaseDirectory() and CStoreFilePath() are a bit coupled, I was thinking we should consider keeping them close to each other. Not sure about this. This also looks good.