Major storage & persistance refactor.
removed storage-old.
fixed tests.