Storage refactoring (lib and tests)