organizing code
adding storage and p2p deps