integrated Ruta
refactoring
updated editor