diff --git a/premake4.lua b/premake4.lua
index 293b1e369..b68267440 100644
--- a/premake4.lua
+++ b/premake4.lua
@@ -1104,7 +1104,7 @@ solution "eepp"
 	project "ecode"
 		set_kind()
 		language "C++"
-		files { "src/tools/codeeditor/*.cpp" }
+		files { "src/tools/ecode/*.cpp" }
 		includedirs { "src/thirdparty/efsw/include", "src/thirdparty" }
 		links { "efsw-static" }
 		if not os.is("windows") and not os.is("haiku") then
diff --git a/premake5.lua b/premake5.lua
index 8ae12331e..296109442 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -853,7 +853,7 @@ workspace "eepp"
 	project "ecode"
 		set_kind()
 		language "C++"
-		files { "src/tools/codeeditor/*.cpp" }
+		files { "src/tools/ecode/*.cpp" }
 		incdirs { "src/thirdparty/efsw/include", "src/thirdparty" }
 		links { "efsw-static" }
 		build_link_configuration( "ecode", true )
diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user
index 1c805ddfc..f3ac06910 100644
--- a/projects/linux/ee.creator.user
+++ b/projects/linux/ee.creator.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 7.0.0, 2022-03-27T01:04:14. -->
+<!-- Written by QtCreator 7.0.0, 2022-04-01T00:37:29. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/projects/linux/ee.files b/projects/linux/ee.files
index d1a1fa11f..9cb7db7a3 100644
--- a/projects/linux/ee.files
+++ b/projects/linux/ee.files
@@ -1096,37 +1096,37 @@
 ../../src/thirdparty/efsw/src/efsw/platform/win/ThreadImpl.hpp
 ../../src/thirdparty/efsw/src/efsw/sophist.h
 ../../src/thirdparty/efsw/src/test/efsw-test.cpp
-../../src/tools/codeeditor/appconfig.cpp
-../../src/tools/codeeditor/appconfig.hpp
-../../src/tools/codeeditor/autocompletemodule.cpp
-../../src/tools/codeeditor/autocompletemodule.hpp
-../../src/tools/codeeditor/codeeditor.cpp
-../../src/tools/codeeditor/codeeditor.hpp
-../../src/tools/codeeditor/docsearchcontroller.cpp
-../../src/tools/codeeditor/docsearchcontroller.hpp
-../../src/tools/codeeditor/filelocator.cpp
-../../src/tools/codeeditor/filelocator.hpp
-../../src/tools/codeeditor/filesystemlistener.cpp
-../../src/tools/codeeditor/filesystemlistener.hpp
-../../src/tools/codeeditor/formattermodule.cpp
-../../src/tools/codeeditor/formattermodule.hpp
-../../src/tools/codeeditor/globalsearchcontroller.cpp
-../../src/tools/codeeditor/globalsearchcontroller.hpp
-../../src/tools/codeeditor/ignorematcher.cpp
-../../src/tools/codeeditor/ignorematcher.hpp
-../../src/tools/codeeditor/lintermodule.cpp
-../../src/tools/codeeditor/lintermodule.hpp
-../../src/tools/codeeditor/notificationcenter.cpp
-../../src/tools/codeeditor/notificationcenter.hpp
-../../src/tools/codeeditor/projectdirectorytree.cpp
-../../src/tools/codeeditor/projectdirectorytree.hpp
-../../src/tools/codeeditor/projectsearch.cpp
-../../src/tools/codeeditor/projectsearch.hpp
-../../src/tools/codeeditor/uicodeeditorsplitter.cpp
-../../src/tools/codeeditor/uicodeeditorsplitter.hpp
-../../src/tools/codeeditor/uitreeviewglobalsearch.cpp
-../../src/tools/codeeditor/uitreeviewglobalsearch.hpp
-../../src/tools/codeeditor/widgetcommandexecuter.hpp
+../../src/tools/ecode/appconfig.cpp
+../../src/tools/ecode/appconfig.hpp
+../../src/tools/ecode/autocompletemodule.cpp
+../../src/tools/ecode/autocompletemodule.hpp
+../../src/tools/ecode/ecode.cpp
+../../src/tools/ecode/ecode.hpp
+../../src/tools/ecode/docsearchcontroller.cpp
+../../src/tools/ecode/docsearchcontroller.hpp
+../../src/tools/ecode/filelocator.cpp
+../../src/tools/ecode/filelocator.hpp
+../../src/tools/ecode/filesystemlistener.cpp
+../../src/tools/ecode/filesystemlistener.hpp
+../../src/tools/ecode/formattermodule.cpp
+../../src/tools/ecode/formattermodule.hpp
+../../src/tools/ecode/globalsearchcontroller.cpp
+../../src/tools/ecode/globalsearchcontroller.hpp
+../../src/tools/ecode/ignorematcher.cpp
+../../src/tools/ecode/ignorematcher.hpp
+../../src/tools/ecode/lintermodule.cpp
+../../src/tools/ecode/lintermodule.hpp
+../../src/tools/ecode/notificationcenter.cpp
+../../src/tools/ecode/notificationcenter.hpp
+../../src/tools/ecode/projectdirectorytree.cpp
+../../src/tools/ecode/projectdirectorytree.hpp
+../../src/tools/ecode/projectsearch.cpp
+../../src/tools/ecode/projectsearch.hpp
+../../src/tools/ecode/uicodeeditorsplitter.cpp
+../../src/tools/ecode/uicodeeditorsplitter.hpp
+../../src/tools/ecode/uitreeviewglobalsearch.cpp
+../../src/tools/ecode/uitreeviewglobalsearch.hpp
+../../src/tools/ecode/widgetcommandexecuter.hpp
 ../../src/tools/mapeditor/mapeditor.cpp
 ../../src/tools/textureatlaseditor/textureatlaseditor.cpp
 ../../src/tools/texturepacker/texturepacker.cpp
diff --git a/projects/osx/ee.files b/projects/osx/ee.files
index a23b40d43..82706c780 100644
--- a/projects/osx/ee.files
+++ b/projects/osx/ee.files
@@ -2,11 +2,13 @@
 ../../TODO.md
 ../../bin/assets/colorschemes/colorschemes.conf
 ../../bin/assets/ee.ini
+../../bin/assets/formatter/formatter.json
 ../../bin/assets/layouts/imported.css
 ../../bin/assets/layouts/test.css
 ../../bin/assets/layouts/test.xml
 ../../bin/assets/layouts/test2.xml
 ../../bin/assets/layouts/test_widgets.xml
+../../bin/assets/linters/linters.json
 ../../bin/assets/ui/breeze.css
 ../../bin/assets/ui/uitheme.css
 ../../docs/articles/cssspecification.md
@@ -342,7 +344,10 @@
 ../../include/eepp/ui/models/itemlistmodel.hpp
 ../../include/eepp/ui/models/model.hpp
 ../../include/eepp/ui/models/modelindex.hpp
+../../include/eepp/ui/models/modelrole.hpp
 ../../include/eepp/ui/models/modelselection.hpp
+../../include/eepp/ui/models/persistentmodelindex.hpp
+../../include/eepp/ui/models/sortingproxymodel.hpp
 ../../include/eepp/ui/models/widgettreemodel.hpp
 ../../include/eepp/ui/tools/textureatlaseditor.hpp
 ../../include/eepp/ui/tools/uicodeeditorsplitter.hpp
@@ -368,6 +373,7 @@
 ../../include/eepp/ui/uilinearlayout.hpp
 ../../include/eepp/ui/uilistbox.hpp
 ../../include/eepp/ui/uilistboxitem.hpp
+../../include/eepp/ui/uilistview.hpp
 ../../include/eepp/ui/uiloader.hpp
 ../../include/eepp/ui/uimanager.hpp
 ../../include/eepp/ui/uimenubar.hpp
@@ -378,6 +384,7 @@
 ../../include/eepp/ui/uimenuseparator.hpp
 ../../include/eepp/ui/uimenusubmenu.hpp
 ../../include/eepp/ui/uimessagebox.hpp
+../../include/eepp/ui/uimultimodelview.hpp
 ../../include/eepp/ui/uinode.hpp
 ../../include/eepp/ui/uinodedrawable.hpp
 ../../include/eepp/ui/uipopupmenu.hpp
@@ -396,6 +403,7 @@
 ../../include/eepp/ui/uispinbox.hpp
 ../../include/eepp/ui/uisplitter.hpp
 ../../include/eepp/ui/uisprite.hpp
+../../include/eepp/ui/uistackwidget.hpp
 ../../include/eepp/ui/uistate.hpp
 ../../include/eepp/ui/uistyle.hpp
 ../../include/eepp/ui/uitab.hpp
@@ -813,7 +821,10 @@
 ../../src/eepp/ui/keyboardshortcut.cpp
 ../../src/eepp/ui/models/filesystemmodel.cpp
 ../../src/eepp/ui/models/model.cpp
+../../src/eepp/ui/models/modelindex.cpp
 ../../src/eepp/ui/models/modelselection.cpp
+../../src/eepp/ui/models/persistentmodelindex.cpp
+../../src/eepp/ui/models/sortingproxymodel.cpp
 ../../src/eepp/ui/models/widgettreemodel.cpp
 ../../src/eepp/ui/tools/textureatlaseditor.cpp
 ../../src/eepp/ui/tools/textureatlasnew.cpp
@@ -840,6 +851,7 @@
 ../../src/eepp/ui/uilinearlayout.cpp
 ../../src/eepp/ui/uilistbox.cpp
 ../../src/eepp/ui/uilistboxitem.cpp
+../../src/eepp/ui/uilistview.cpp
 ../../src/eepp/ui/uiloader.cpp
 ../../src/eepp/ui/uimanager.cpp
 ../../src/eepp/ui/uimenubar.cpp
@@ -850,6 +862,7 @@
 ../../src/eepp/ui/uimenuseparator.cpp
 ../../src/eepp/ui/uimenusubmenu.cpp
 ../../src/eepp/ui/uimessagebox.cpp
+../../src/eepp/ui/uimultimodelview.cpp
 ../../src/eepp/ui/uinode.cpp
 ../../src/eepp/ui/uinodedrawable.cpp
 ../../src/eepp/ui/uipopupmenu.cpp
@@ -868,6 +881,7 @@
 ../../src/eepp/ui/uispinbox.cpp
 ../../src/eepp/ui/uisplitter.cpp
 ../../src/eepp/ui/uisprite.cpp
+../../src/eepp/ui/uistackwidget.cpp
 ../../src/eepp/ui/uistate.cpp
 ../../src/eepp/ui/uistyle.cpp
 ../../src/eepp/ui/uitab.cpp
@@ -1009,18 +1023,110 @@
 ../../src/thirdparty/SOIL2/src/SOIL2/stbi_pkm.h
 ../../src/thirdparty/SOIL2/src/SOIL2/stbi_pvr_c.h
 ../../src/thirdparty/SOIL2/src/SOIL2/stbi_pvr.h
-../../src/tools/codeeditor/autocompletemodule.cpp
-../../src/tools/codeeditor/autocompletemodule.hpp
-../../src/tools/codeeditor/codeeditor.cpp
-../../src/tools/codeeditor/codeeditor.hpp
-../../src/tools/codeeditor/ignorematcher.cpp
-../../src/tools/codeeditor/ignorematcher.hpp
-../../src/tools/codeeditor/projectdirectorytree.cpp
-../../src/tools/codeeditor/projectdirectorytree.hpp
-../../src/tools/codeeditor/projectsearch.cpp
-../../src/tools/codeeditor/projectsearch.hpp
-../../src/tools/codeeditor/uicodeeditorsplitter.cpp
-../../src/tools/codeeditor/uicodeeditorsplitter.hpp
+../../src/thirdparty/efsw/include/efsw/efsw.h
+../../src/thirdparty/efsw/include/efsw/efsw.hpp
+../../src/thirdparty/efsw/src/efsw/Debug.cpp
+../../src/thirdparty/efsw/src/efsw/Debug.hpp
+../../src/thirdparty/efsw/src/efsw/DirWatcherGeneric.cpp
+../../src/thirdparty/efsw/src/efsw/DirWatcherGeneric.hpp
+../../src/thirdparty/efsw/src/efsw/DirectorySnapshot.cpp
+../../src/thirdparty/efsw/src/efsw/DirectorySnapshot.hpp
+../../src/thirdparty/efsw/src/efsw/DirectorySnapshotDiff.cpp
+../../src/thirdparty/efsw/src/efsw/DirectorySnapshotDiff.hpp
+../../src/thirdparty/efsw/src/efsw/FileInfo.cpp
+../../src/thirdparty/efsw/src/efsw/FileInfo.hpp
+../../src/thirdparty/efsw/src/efsw/FileSystem.cpp
+../../src/thirdparty/efsw/src/efsw/FileSystem.hpp
+../../src/thirdparty/efsw/src/efsw/FileWatcher.cpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherCWrapper.cpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherFSEvents.cpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherFSEvents.hpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherGeneric.cpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherGeneric.hpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherImpl.cpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherImpl.hpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherInotify.cpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherInotify.hpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherKqueue.cpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherKqueue.hpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherWin32.cpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherWin32.hpp
+../../src/thirdparty/efsw/src/efsw/Lock.hpp
+../../src/thirdparty/efsw/src/efsw/Log.cpp
+../../src/thirdparty/efsw/src/efsw/Mutex.cpp
+../../src/thirdparty/efsw/src/efsw/Mutex.hpp
+../../src/thirdparty/efsw/src/efsw/String.cpp
+../../src/thirdparty/efsw/src/efsw/String.hpp
+../../src/thirdparty/efsw/src/efsw/System.cpp
+../../src/thirdparty/efsw/src/efsw/System.hpp
+../../src/thirdparty/efsw/src/efsw/Thread.cpp
+../../src/thirdparty/efsw/src/efsw/Thread.hpp
+../../src/thirdparty/efsw/src/efsw/Utf.hpp
+../../src/thirdparty/efsw/src/efsw/Utf.inl
+../../src/thirdparty/efsw/src/efsw/Watcher.cpp
+../../src/thirdparty/efsw/src/efsw/Watcher.hpp
+../../src/thirdparty/efsw/src/efsw/WatcherFSEvents.cpp
+../../src/thirdparty/efsw/src/efsw/WatcherFSEvents.hpp
+../../src/thirdparty/efsw/src/efsw/WatcherGeneric.cpp
+../../src/thirdparty/efsw/src/efsw/WatcherGeneric.hpp
+../../src/thirdparty/efsw/src/efsw/WatcherInotify.cpp
+../../src/thirdparty/efsw/src/efsw/WatcherInotify.hpp
+../../src/thirdparty/efsw/src/efsw/WatcherKqueue.cpp
+../../src/thirdparty/efsw/src/efsw/WatcherKqueue.hpp
+../../src/thirdparty/efsw/src/efsw/WatcherWin32.cpp
+../../src/thirdparty/efsw/src/efsw/WatcherWin32.hpp
+../../src/thirdparty/efsw/src/efsw/base.hpp
+../../src/thirdparty/efsw/src/efsw/inotify-nosys.h
+../../src/thirdparty/efsw/src/efsw/platform/platformimpl.hpp
+../../src/thirdparty/efsw/src/efsw/platform/posix/FileSystemImpl.cpp
+../../src/thirdparty/efsw/src/efsw/platform/posix/FileSystemImpl.hpp
+../../src/thirdparty/efsw/src/efsw/platform/posix/MutexImpl.cpp
+../../src/thirdparty/efsw/src/efsw/platform/posix/MutexImpl.hpp
+../../src/thirdparty/efsw/src/efsw/platform/posix/SystemImpl.cpp
+../../src/thirdparty/efsw/src/efsw/platform/posix/SystemImpl.hpp
+../../src/thirdparty/efsw/src/efsw/platform/posix/ThreadImpl.cpp
+../../src/thirdparty/efsw/src/efsw/platform/posix/ThreadImpl.hpp
+../../src/thirdparty/efsw/src/efsw/platform/win/FileSystemImpl.cpp
+../../src/thirdparty/efsw/src/efsw/platform/win/FileSystemImpl.hpp
+../../src/thirdparty/efsw/src/efsw/platform/win/MutexImpl.cpp
+../../src/thirdparty/efsw/src/efsw/platform/win/MutexImpl.hpp
+../../src/thirdparty/efsw/src/efsw/platform/win/SystemImpl.cpp
+../../src/thirdparty/efsw/src/efsw/platform/win/SystemImpl.hpp
+../../src/thirdparty/efsw/src/efsw/platform/win/ThreadImpl.cpp
+../../src/thirdparty/efsw/src/efsw/platform/win/ThreadImpl.hpp
+../../src/thirdparty/efsw/src/efsw/sophist.h
+../../src/thirdparty/efsw/src/test/efsw-test.cpp
+../../src/tools/ecode/appconfig.cpp
+../../src/tools/ecode/appconfig.hpp
+../../src/tools/ecode/autocompletemodule.cpp
+../../src/tools/ecode/autocompletemodule.hpp
+../../src/tools/ecode/codeeditor.cpp
+../../src/tools/ecode/codeeditor.hpp
+../../src/tools/ecode/docsearchcontroller.cpp
+../../src/tools/ecode/docsearchcontroller.hpp
+../../src/tools/ecode/filelocator.cpp
+../../src/tools/ecode/filelocator.hpp
+../../src/tools/ecode/filesystemlistener.cpp
+../../src/tools/ecode/filesystemlistener.hpp
+../../src/tools/ecode/formattermodule.cpp
+../../src/tools/ecode/formattermodule.hpp
+../../src/tools/ecode/globalsearchcontroller.cpp
+../../src/tools/ecode/globalsearchcontroller.hpp
+../../src/tools/ecode/ignorematcher.cpp
+../../src/tools/ecode/ignorematcher.hpp
+../../src/tools/ecode/lintermodule.cpp
+../../src/tools/ecode/lintermodule.hpp
+../../src/tools/ecode/notificationcenter.cpp
+../../src/tools/ecode/notificationcenter.hpp
+../../src/tools/ecode/projectdirectorytree.cpp
+../../src/tools/ecode/projectdirectorytree.hpp
+../../src/tools/ecode/projectsearch.cpp
+../../src/tools/ecode/projectsearch.hpp
+../../src/tools/ecode/uicodeeditorsplitter.cpp
+../../src/tools/ecode/uicodeeditorsplitter.hpp
+../../src/tools/ecode/uitreeviewglobalsearch.cpp
+../../src/tools/ecode/uitreeviewglobalsearch.hpp
+../../src/tools/ecode/widgetcommandexecuter.hpp
 ../../src/tools/mapeditor/mapeditor.cpp
 ../../src/tools/textureatlaseditor/textureatlaseditor.cpp
 ../../src/tools/texturepacker/texturepacker.cpp
diff --git a/projects/windows/ee.files b/projects/windows/ee.files
index 2bd4ca5b6..82706c780 100644
--- a/projects/windows/ee.files
+++ b/projects/windows/ee.files
@@ -2,11 +2,13 @@
 ../../TODO.md
 ../../bin/assets/colorschemes/colorschemes.conf
 ../../bin/assets/ee.ini
+../../bin/assets/formatter/formatter.json
 ../../bin/assets/layouts/imported.css
 ../../bin/assets/layouts/test.css
 ../../bin/assets/layouts/test.xml
 ../../bin/assets/layouts/test2.xml
 ../../bin/assets/layouts/test_widgets.xml
+../../bin/assets/linters/linters.json
 ../../bin/assets/ui/breeze.css
 ../../bin/assets/ui/uitheme.css
 ../../docs/articles/cssspecification.md
@@ -342,7 +344,9 @@
 ../../include/eepp/ui/models/itemlistmodel.hpp
 ../../include/eepp/ui/models/model.hpp
 ../../include/eepp/ui/models/modelindex.hpp
+../../include/eepp/ui/models/modelrole.hpp
 ../../include/eepp/ui/models/modelselection.hpp
+../../include/eepp/ui/models/persistentmodelindex.hpp
 ../../include/eepp/ui/models/sortingproxymodel.hpp
 ../../include/eepp/ui/models/widgettreemodel.hpp
 ../../include/eepp/ui/tools/textureatlaseditor.hpp
@@ -817,7 +821,9 @@
 ../../src/eepp/ui/keyboardshortcut.cpp
 ../../src/eepp/ui/models/filesystemmodel.cpp
 ../../src/eepp/ui/models/model.cpp
+../../src/eepp/ui/models/modelindex.cpp
 ../../src/eepp/ui/models/modelselection.cpp
+../../src/eepp/ui/models/persistentmodelindex.cpp
 ../../src/eepp/ui/models/sortingproxymodel.cpp
 ../../src/eepp/ui/models/widgettreemodel.cpp
 ../../src/eepp/ui/tools/textureatlaseditor.cpp
@@ -1017,24 +1023,110 @@
 ../../src/thirdparty/SOIL2/src/SOIL2/stbi_pkm.h
 ../../src/thirdparty/SOIL2/src/SOIL2/stbi_pvr_c.h
 ../../src/thirdparty/SOIL2/src/SOIL2/stbi_pvr.h
-../../src/tools/codeeditor/appconfig.cpp
-../../src/tools/codeeditor/appconfig.hpp
-../../src/tools/codeeditor/autocompletemodule.cpp
-../../src/tools/codeeditor/autocompletemodule.hpp
-../../src/tools/codeeditor/codeeditor.cpp
-../../src/tools/codeeditor/codeeditor.hpp
-../../src/tools/codeeditor/filesystemlistener.cpp
-../../src/tools/codeeditor/filesystemlistener.hpp
-../../src/tools/codeeditor/ignorematcher.cpp
-../../src/tools/codeeditor/ignorematcher.hpp
-../../src/tools/codeeditor/projectdirectorytree.cpp
-../../src/tools/codeeditor/projectdirectorytree.hpp
-../../src/tools/codeeditor/projectsearch.cpp
-../../src/tools/codeeditor/projectsearch.hpp
-../../src/tools/codeeditor/uicodeeditorsplitter.cpp
-../../src/tools/codeeditor/uicodeeditorsplitter.hpp
-../../src/tools/codeeditor/uitreeviewglobalsearch.cpp
-../../src/tools/codeeditor/uitreeviewglobalsearch.hpp
+../../src/thirdparty/efsw/include/efsw/efsw.h
+../../src/thirdparty/efsw/include/efsw/efsw.hpp
+../../src/thirdparty/efsw/src/efsw/Debug.cpp
+../../src/thirdparty/efsw/src/efsw/Debug.hpp
+../../src/thirdparty/efsw/src/efsw/DirWatcherGeneric.cpp
+../../src/thirdparty/efsw/src/efsw/DirWatcherGeneric.hpp
+../../src/thirdparty/efsw/src/efsw/DirectorySnapshot.cpp
+../../src/thirdparty/efsw/src/efsw/DirectorySnapshot.hpp
+../../src/thirdparty/efsw/src/efsw/DirectorySnapshotDiff.cpp
+../../src/thirdparty/efsw/src/efsw/DirectorySnapshotDiff.hpp
+../../src/thirdparty/efsw/src/efsw/FileInfo.cpp
+../../src/thirdparty/efsw/src/efsw/FileInfo.hpp
+../../src/thirdparty/efsw/src/efsw/FileSystem.cpp
+../../src/thirdparty/efsw/src/efsw/FileSystem.hpp
+../../src/thirdparty/efsw/src/efsw/FileWatcher.cpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherCWrapper.cpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherFSEvents.cpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherFSEvents.hpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherGeneric.cpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherGeneric.hpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherImpl.cpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherImpl.hpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherInotify.cpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherInotify.hpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherKqueue.cpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherKqueue.hpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherWin32.cpp
+../../src/thirdparty/efsw/src/efsw/FileWatcherWin32.hpp
+../../src/thirdparty/efsw/src/efsw/Lock.hpp
+../../src/thirdparty/efsw/src/efsw/Log.cpp
+../../src/thirdparty/efsw/src/efsw/Mutex.cpp
+../../src/thirdparty/efsw/src/efsw/Mutex.hpp
+../../src/thirdparty/efsw/src/efsw/String.cpp
+../../src/thirdparty/efsw/src/efsw/String.hpp
+../../src/thirdparty/efsw/src/efsw/System.cpp
+../../src/thirdparty/efsw/src/efsw/System.hpp
+../../src/thirdparty/efsw/src/efsw/Thread.cpp
+../../src/thirdparty/efsw/src/efsw/Thread.hpp
+../../src/thirdparty/efsw/src/efsw/Utf.hpp
+../../src/thirdparty/efsw/src/efsw/Utf.inl
+../../src/thirdparty/efsw/src/efsw/Watcher.cpp
+../../src/thirdparty/efsw/src/efsw/Watcher.hpp
+../../src/thirdparty/efsw/src/efsw/WatcherFSEvents.cpp
+../../src/thirdparty/efsw/src/efsw/WatcherFSEvents.hpp
+../../src/thirdparty/efsw/src/efsw/WatcherGeneric.cpp
+../../src/thirdparty/efsw/src/efsw/WatcherGeneric.hpp
+../../src/thirdparty/efsw/src/efsw/WatcherInotify.cpp
+../../src/thirdparty/efsw/src/efsw/WatcherInotify.hpp
+../../src/thirdparty/efsw/src/efsw/WatcherKqueue.cpp
+../../src/thirdparty/efsw/src/efsw/WatcherKqueue.hpp
+../../src/thirdparty/efsw/src/efsw/WatcherWin32.cpp
+../../src/thirdparty/efsw/src/efsw/WatcherWin32.hpp
+../../src/thirdparty/efsw/src/efsw/base.hpp
+../../src/thirdparty/efsw/src/efsw/inotify-nosys.h
+../../src/thirdparty/efsw/src/efsw/platform/platformimpl.hpp
+../../src/thirdparty/efsw/src/efsw/platform/posix/FileSystemImpl.cpp
+../../src/thirdparty/efsw/src/efsw/platform/posix/FileSystemImpl.hpp
+../../src/thirdparty/efsw/src/efsw/platform/posix/MutexImpl.cpp
+../../src/thirdparty/efsw/src/efsw/platform/posix/MutexImpl.hpp
+../../src/thirdparty/efsw/src/efsw/platform/posix/SystemImpl.cpp
+../../src/thirdparty/efsw/src/efsw/platform/posix/SystemImpl.hpp
+../../src/thirdparty/efsw/src/efsw/platform/posix/ThreadImpl.cpp
+../../src/thirdparty/efsw/src/efsw/platform/posix/ThreadImpl.hpp
+../../src/thirdparty/efsw/src/efsw/platform/win/FileSystemImpl.cpp
+../../src/thirdparty/efsw/src/efsw/platform/win/FileSystemImpl.hpp
+../../src/thirdparty/efsw/src/efsw/platform/win/MutexImpl.cpp
+../../src/thirdparty/efsw/src/efsw/platform/win/MutexImpl.hpp
+../../src/thirdparty/efsw/src/efsw/platform/win/SystemImpl.cpp
+../../src/thirdparty/efsw/src/efsw/platform/win/SystemImpl.hpp
+../../src/thirdparty/efsw/src/efsw/platform/win/ThreadImpl.cpp
+../../src/thirdparty/efsw/src/efsw/platform/win/ThreadImpl.hpp
+../../src/thirdparty/efsw/src/efsw/sophist.h
+../../src/thirdparty/efsw/src/test/efsw-test.cpp
+../../src/tools/ecode/appconfig.cpp
+../../src/tools/ecode/appconfig.hpp
+../../src/tools/ecode/autocompletemodule.cpp
+../../src/tools/ecode/autocompletemodule.hpp
+../../src/tools/ecode/codeeditor.cpp
+../../src/tools/ecode/codeeditor.hpp
+../../src/tools/ecode/docsearchcontroller.cpp
+../../src/tools/ecode/docsearchcontroller.hpp
+../../src/tools/ecode/filelocator.cpp
+../../src/tools/ecode/filelocator.hpp
+../../src/tools/ecode/filesystemlistener.cpp
+../../src/tools/ecode/filesystemlistener.hpp
+../../src/tools/ecode/formattermodule.cpp
+../../src/tools/ecode/formattermodule.hpp
+../../src/tools/ecode/globalsearchcontroller.cpp
+../../src/tools/ecode/globalsearchcontroller.hpp
+../../src/tools/ecode/ignorematcher.cpp
+../../src/tools/ecode/ignorematcher.hpp
+../../src/tools/ecode/lintermodule.cpp
+../../src/tools/ecode/lintermodule.hpp
+../../src/tools/ecode/notificationcenter.cpp
+../../src/tools/ecode/notificationcenter.hpp
+../../src/tools/ecode/projectdirectorytree.cpp
+../../src/tools/ecode/projectdirectorytree.hpp
+../../src/tools/ecode/projectsearch.cpp
+../../src/tools/ecode/projectsearch.hpp
+../../src/tools/ecode/uicodeeditorsplitter.cpp
+../../src/tools/ecode/uicodeeditorsplitter.hpp
+../../src/tools/ecode/uitreeviewglobalsearch.cpp
+../../src/tools/ecode/uitreeviewglobalsearch.hpp
+../../src/tools/ecode/widgetcommandexecuter.hpp
 ../../src/tools/mapeditor/mapeditor.cpp
 ../../src/tools/textureatlaseditor/textureatlaseditor.cpp
 ../../src/tools/texturepacker/texturepacker.cpp
diff --git a/src/tools/codeeditor/appconfig.cpp b/src/tools/ecode/appconfig.cpp
similarity index 100%
rename from src/tools/codeeditor/appconfig.cpp
rename to src/tools/ecode/appconfig.cpp
diff --git a/src/tools/codeeditor/appconfig.hpp b/src/tools/ecode/appconfig.hpp
similarity index 100%
rename from src/tools/codeeditor/appconfig.hpp
rename to src/tools/ecode/appconfig.hpp
diff --git a/src/tools/codeeditor/autocompletemodule.cpp b/src/tools/ecode/autocompletemodule.cpp
similarity index 100%
rename from src/tools/codeeditor/autocompletemodule.cpp
rename to src/tools/ecode/autocompletemodule.cpp
diff --git a/src/tools/codeeditor/autocompletemodule.hpp b/src/tools/ecode/autocompletemodule.hpp
similarity index 100%
rename from src/tools/codeeditor/autocompletemodule.hpp
rename to src/tools/ecode/autocompletemodule.hpp
diff --git a/src/tools/codeeditor/docsearchcontroller.cpp b/src/tools/ecode/docsearchcontroller.cpp
similarity index 99%
rename from src/tools/codeeditor/docsearchcontroller.cpp
rename to src/tools/ecode/docsearchcontroller.cpp
index 8b64cff48..8bf278ca1 100644
--- a/src/tools/codeeditor/docsearchcontroller.cpp
+++ b/src/tools/ecode/docsearchcontroller.cpp
@@ -1,5 +1,5 @@
 #include "docsearchcontroller.hpp"
-#include "codeeditor.hpp"
+#include "ecode.hpp"
 
 DocSearchController::DocSearchController( UICodeEditorSplitter* editorSplitter, App* app ) :
 	mEditorSplitter( editorSplitter ), mApp( app ) {}
diff --git a/src/tools/codeeditor/docsearchcontroller.hpp b/src/tools/ecode/docsearchcontroller.hpp
similarity index 100%
rename from src/tools/codeeditor/docsearchcontroller.hpp
rename to src/tools/ecode/docsearchcontroller.hpp
diff --git a/src/tools/codeeditor/codeeditor.cpp b/src/tools/ecode/ecode.cpp
similarity index 99%
rename from src/tools/codeeditor/codeeditor.cpp
rename to src/tools/ecode/ecode.cpp
index e4eb6cf5e..25a086830 100644
--- a/src/tools/codeeditor/codeeditor.cpp
+++ b/src/tools/ecode/ecode.cpp
@@ -1,4 +1,4 @@
-#include "codeeditor.hpp"
+#include "ecode.hpp"
 #include "autocompletemodule.hpp"
 #include "formattermodule.hpp"
 #include "lintermodule.hpp"
diff --git a/src/tools/codeeditor/codeeditor.hpp b/src/tools/ecode/ecode.hpp
similarity index 100%
rename from src/tools/codeeditor/codeeditor.hpp
rename to src/tools/ecode/ecode.hpp
diff --git a/src/tools/codeeditor/filelocator.cpp b/src/tools/ecode/filelocator.cpp
similarity index 99%
rename from src/tools/codeeditor/filelocator.cpp
rename to src/tools/ecode/filelocator.cpp
index a08abc2a5..84a46ba15 100644
--- a/src/tools/codeeditor/filelocator.cpp
+++ b/src/tools/ecode/filelocator.cpp
@@ -1,5 +1,5 @@
 #include "filelocator.hpp"
-#include "codeeditor.hpp"
+#include "ecode.hpp"
 
 static int LOCATEBAR_MAX_VISIBLE_ITEMS = 18;
 static int LOCATEBAR_MAX_RESULTS = 100;
diff --git a/src/tools/codeeditor/filelocator.hpp b/src/tools/ecode/filelocator.hpp
similarity index 100%
rename from src/tools/codeeditor/filelocator.hpp
rename to src/tools/ecode/filelocator.hpp
diff --git a/src/tools/codeeditor/filesystemlistener.cpp b/src/tools/ecode/filesystemlistener.cpp
similarity index 100%
rename from src/tools/codeeditor/filesystemlistener.cpp
rename to src/tools/ecode/filesystemlistener.cpp
diff --git a/src/tools/codeeditor/filesystemlistener.hpp b/src/tools/ecode/filesystemlistener.hpp
similarity index 100%
rename from src/tools/codeeditor/filesystemlistener.hpp
rename to src/tools/ecode/filesystemlistener.hpp
diff --git a/src/tools/codeeditor/formattermodule.cpp b/src/tools/ecode/formattermodule.cpp
similarity index 100%
rename from src/tools/codeeditor/formattermodule.cpp
rename to src/tools/ecode/formattermodule.cpp
diff --git a/src/tools/codeeditor/formattermodule.hpp b/src/tools/ecode/formattermodule.hpp
similarity index 100%
rename from src/tools/codeeditor/formattermodule.hpp
rename to src/tools/ecode/formattermodule.hpp
diff --git a/src/tools/codeeditor/globalsearchcontroller.cpp b/src/tools/ecode/globalsearchcontroller.cpp
similarity index 99%
rename from src/tools/codeeditor/globalsearchcontroller.cpp
rename to src/tools/ecode/globalsearchcontroller.cpp
index 2f60e9642..231b98f45 100644
--- a/src/tools/codeeditor/globalsearchcontroller.cpp
+++ b/src/tools/ecode/globalsearchcontroller.cpp
@@ -1,5 +1,5 @@
 #include "globalsearchcontroller.hpp"
-#include "codeeditor.hpp"
+#include "ecode.hpp"
 #include "uitreeviewglobalsearch.hpp"
 
 static int LOCATEBAR_MAX_VISIBLE_ITEMS = 18;
diff --git a/src/tools/codeeditor/globalsearchcontroller.hpp b/src/tools/ecode/globalsearchcontroller.hpp
similarity index 100%
rename from src/tools/codeeditor/globalsearchcontroller.hpp
rename to src/tools/ecode/globalsearchcontroller.hpp
diff --git a/src/tools/codeeditor/ignorematcher.cpp b/src/tools/ecode/ignorematcher.cpp
similarity index 100%
rename from src/tools/codeeditor/ignorematcher.cpp
rename to src/tools/ecode/ignorematcher.cpp
diff --git a/src/tools/codeeditor/ignorematcher.hpp b/src/tools/ecode/ignorematcher.hpp
similarity index 100%
rename from src/tools/codeeditor/ignorematcher.hpp
rename to src/tools/ecode/ignorematcher.hpp
diff --git a/src/tools/codeeditor/lintermodule.cpp b/src/tools/ecode/lintermodule.cpp
similarity index 100%
rename from src/tools/codeeditor/lintermodule.cpp
rename to src/tools/ecode/lintermodule.cpp
diff --git a/src/tools/codeeditor/lintermodule.hpp b/src/tools/ecode/lintermodule.hpp
similarity index 100%
rename from src/tools/codeeditor/lintermodule.hpp
rename to src/tools/ecode/lintermodule.hpp
diff --git a/src/tools/codeeditor/notificationcenter.cpp b/src/tools/ecode/notificationcenter.cpp
similarity index 100%
rename from src/tools/codeeditor/notificationcenter.cpp
rename to src/tools/ecode/notificationcenter.cpp
diff --git a/src/tools/codeeditor/notificationcenter.hpp b/src/tools/ecode/notificationcenter.hpp
similarity index 100%
rename from src/tools/codeeditor/notificationcenter.hpp
rename to src/tools/ecode/notificationcenter.hpp
diff --git a/src/tools/codeeditor/projectdirectorytree.cpp b/src/tools/ecode/projectdirectorytree.cpp
similarity index 100%
rename from src/tools/codeeditor/projectdirectorytree.cpp
rename to src/tools/ecode/projectdirectorytree.cpp
diff --git a/src/tools/codeeditor/projectdirectorytree.hpp b/src/tools/ecode/projectdirectorytree.hpp
similarity index 100%
rename from src/tools/codeeditor/projectdirectorytree.hpp
rename to src/tools/ecode/projectdirectorytree.hpp
diff --git a/src/tools/codeeditor/projectsearch.cpp b/src/tools/ecode/projectsearch.cpp
similarity index 100%
rename from src/tools/codeeditor/projectsearch.cpp
rename to src/tools/ecode/projectsearch.cpp
diff --git a/src/tools/codeeditor/projectsearch.hpp b/src/tools/ecode/projectsearch.hpp
similarity index 100%
rename from src/tools/codeeditor/projectsearch.hpp
rename to src/tools/ecode/projectsearch.hpp
diff --git a/src/tools/codeeditor/thirdparty/json.hpp b/src/tools/ecode/thirdparty/json.hpp
similarity index 100%
rename from src/tools/codeeditor/thirdparty/json.hpp
rename to src/tools/ecode/thirdparty/json.hpp
diff --git a/src/tools/codeeditor/thirdparty/subprocess.h b/src/tools/ecode/thirdparty/subprocess.h
similarity index 100%
rename from src/tools/codeeditor/thirdparty/subprocess.h
rename to src/tools/ecode/thirdparty/subprocess.h
diff --git a/src/tools/codeeditor/uitreeviewglobalsearch.cpp b/src/tools/ecode/uitreeviewglobalsearch.cpp
similarity index 100%
rename from src/tools/codeeditor/uitreeviewglobalsearch.cpp
rename to src/tools/ecode/uitreeviewglobalsearch.cpp
diff --git a/src/tools/codeeditor/uitreeviewglobalsearch.hpp b/src/tools/ecode/uitreeviewglobalsearch.hpp
similarity index 100%
rename from src/tools/codeeditor/uitreeviewglobalsearch.hpp
rename to src/tools/ecode/uitreeviewglobalsearch.hpp
diff --git a/src/tools/codeeditor/widgetcommandexecuter.hpp b/src/tools/ecode/widgetcommandexecuter.hpp
similarity index 100%
rename from src/tools/codeeditor/widgetcommandexecuter.hpp
rename to src/tools/ecode/widgetcommandexecuter.hpp