folder moved
Merge branch 'hotfix/separate_editor_classes'