Object storage refactoring;