Split storage into separate module, add unit tests