Added .editorconfig file, some new classes and code refactoring
Little code alignment