Added Storage class and mock Diskspace class