Adding storage service information
Refactoring repo sources