Merge "Move digital_stroage.h to its own library"