Rename storage.py to container.py