Moxed all storage into package storage