Move storage wrapper into separate package