Factor our a storage package.