diff --git a/include/Editor.h b/include/Editor.h
index 02a9cbde5..4da0fdbdb 100644
--- a/include/Editor.h
+++ b/include/Editor.h
@@ -33,8 +33,8 @@
 
 /// \brief Superclass for editors with a toolbar.
 ///
-/// Those editors include the Song Editor, the Automation Editor,
-/// B&B Editor, Piano Roll.
+/// Those editors include the Song Editor, the Automation Editor, B&B Editor,
+/// and the Piano Roll.
 class Editor : public QMainWindow
 {
 	Q_OBJECT
diff --git a/src/gui/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp
similarity index 100%
rename from src/gui/AutomationEditor.cpp
rename to src/gui/editors/AutomationEditor.cpp
diff --git a/src/gui/BBEditor.cpp b/src/gui/editors/BBEditor.cpp
similarity index 100%
rename from src/gui/BBEditor.cpp
rename to src/gui/editors/BBEditor.cpp
diff --git a/src/gui/Editor.cpp b/src/gui/editors/Editor.cpp
similarity index 100%
rename from src/gui/Editor.cpp
rename to src/gui/editors/Editor.cpp
diff --git a/src/gui/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
similarity index 100%
rename from src/gui/PianoRoll.cpp
rename to src/gui/editors/PianoRoll.cpp
diff --git a/src/gui/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
similarity index 100%
rename from src/gui/SongEditor.cpp
rename to src/gui/editors/SongEditor.cpp