start to refactor storage
mess up from last commit
decoupled rules storage service
Merge pull request #2 from ranjez/refactor-storage

Refactor storage