Refactoring cinder storage