Moved editor logic to Editor class
Minor changes in Makefiles