Move more storage stuff to storage section.