Editorsettings fixed and files refactored