Move InfoStorage class into separate file.