Move storage creation stuff out of the storage manager