new project structure
Merge branch 'storage' into develop