'storage' is now command multiplexer.

This applies probably on top of my previous merge request.