Moved storage to different package