Changed structure of storage repo.
- merged latest commit with current master branch