storage/demo: move to a subpackage