Issue #10: Reorganized modules related to storage and splitted them to one storage module.