renamed package 'state' -> 'storage'