diff --git a/wally/storage_structure.yaml b/wally/storage_structure.yaml
index 8493e29..db632c0 100644
--- a/wally/storage_structure.yaml
+++ b/wally/storage_structure.yaml
@@ -15,24 +15,8 @@
 fuel_version: List[int]          # FUEL master node version
 fuel_os_creds: OSCreds           # openstack creds, discovered from fuel (or None)
 openstack_openrc: OSCreds        # openrc used for openstack cluster
-
-info:
-    comment : str               # run comment
-    run_uuid : str              # run uuid
-    run_time : float            # unix time when test first starts
-
-'results/{suite}_{profile}_{id}':
-    config: TestSuiteConfig   # test job(iteration) input config, {id} is id of first job in suite
-    '{descr}_{id}':
-        config: TestJobConfig  # test job(iteration) input config
-
-        # dev in next line is tool name - fio/vdbench/....
-        '{node}_{dev}.{metric_name}:raw' : bytes  # raw log, where name from {'bw', 'iops', 'lat', ..}
-        '{node}_{dev}.{metric_name}:stat' : StatProps  # type of props detected by content
-        '{node}_{dev}.{metric_name}': List[uint64]   # measurements data concatenated with collect times in
-                                                     # microseconds from unix epoch and typechars
-'sensors/{node}_{sensor}.{dev}.{metric_name}': typechar + array[uint64]  # sensor values
-'sensors/{node}_{sensor}.{dev}.{metric_name}:stat': StatProps # statistic data
-'sensors/{node}_collected_at': typechar + array[uint64]  # collection time
-
-'rpc_logs/{node}' : bytes   # rpc server log from node
+'results/{suite}.info.yaml': SuiteConfig   # test job(iteration) input config, {id} is id of first job in suite
+'results/{suite}.{job}/{node}.{loader}.{metric}.{tag}':
+'sensors/{node}_{sensor}.{dev}.{metric_name}.{tag}': # sensor values
+'sensors/{node}_collected_at.csv':
+'rpc_logs/{node}.txt' : bytes   # rpc server log from node