Fixed disk repository saving
Refactored disk storage