Added Storage class and Mock diskfile class