Refactoring. Creating a storage package.