Refactored storage

TODO:
- fix & write unit test
- run flare-tests with kch/tcb