Finished up the storage efficiency changes.
Next patch will probably at most just re-namespace some of the structs.