More refactoring.
Moved EditorTool to other package.