Move struct object and its methods to storage.h
Minor cleanup.