Created storage module
Removed Storage class
Now using storage module