Move Storage Format to a separate file