Refactored storage

Refactored storage code

Refactoring of storage

Storage refactoring
Merge branch 'master' of https://github.com/stuartshay/NavigatorGlass