Merge branch 'hotfix/structure'
temp index for cordova
Merge branch 'hotfix/cordova-index' into develop