fixing editor file structure
Merge branch 'master' into hotfix/editor