#24 refactoritng moving storage to separate module