Merge branch 'hotfix/change_import'
Merge branch 'develop'
Changed structure and names