Moved editor and rightseditor into separate modules