diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b824cc48ad..7908e4f8215 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -905,16 +905,13 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/library/basesqltablemodel.cpp
   src/library/basetrackcache.cpp
   src/library/basetracktablemodel.cpp
-  src/library/bpmdelegate.cpp
   src/library/browse/browsefeature.cpp
   src/library/browse/browsetablemodel.cpp
   src/library/browse/browsethread.cpp
   src/library/browse/foldertreemodel.cpp
-  src/library/colordelegate.cpp
   src/library/columncache.cpp
   src/library/coverart.cpp
   src/library/coverartcache.cpp
-  src/library/coverartdelegate.cpp
   src/library/coverartutils.cpp
   src/library/dao/analysisdao.cpp
   src/library/dao/autodjcratesdao.cpp
@@ -948,7 +945,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/library/librarycontrol.cpp
   src/library/libraryfeature.cpp
   src/library/librarytablemodel.cpp
-  src/library/locationdelegate.cpp
   src/library/missing_hidden/dlghidden.cpp
   src/library/missing_hidden/dlghidden.ui
   src/library/missing_hidden/dlgmissing.cpp
@@ -956,14 +952,11 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/library/missing_hidden/hiddentablemodel.cpp
   src/library/missing_hidden/missingtablemodel.cpp
   src/library/mixxxlibraryfeature.cpp
-  src/library/multilineeditdelegate.cpp
   src/library/parser.cpp
   src/library/parsercsv.cpp
   src/library/parserm3u.cpp
   src/library/parserpls.cpp
-  src/library/playcountdelegate.cpp
   src/library/playlisttablemodel.cpp
-  src/library/previewbuttondelegate.cpp
   src/library/proxytrackmodel.cpp
   src/library/recording/dlgrecording.cpp
   src/library/recording/dlgrecording.ui
@@ -982,10 +975,17 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/library/serato/seratofeature.cpp
   src/library/serato/seratoplaylistmodel.cpp
   src/library/sidebarmodel.cpp
-  src/library/stardelegate.cpp
-  src/library/stareditor.cpp
   src/library/starrating.cpp
-  src/library/tableitemdelegate.cpp
+  src/library/tabledelegates/bpmdelegate.cpp
+  src/library/tabledelegates/colordelegate.cpp
+  src/library/tabledelegates/coverartdelegate.cpp
+  src/library/tabledelegates/locationdelegate.cpp
+  src/library/tabledelegates/multilineeditdelegate.cpp
+  src/library/tabledelegates/playcountdelegate.cpp
+  src/library/tabledelegates/previewbuttondelegate.cpp
+  src/library/tabledelegates/stardelegate.cpp
+  src/library/tabledelegates/stareditor.cpp
+  src/library/tabledelegates/tableitemdelegate.cpp
   src/library/trackcollection.cpp
   src/library/trackcollectioniterator.cpp
   src/library/trackcollectionmanager.cpp
diff --git a/src/library/basetracktablemodel.cpp b/src/library/basetracktablemodel.cpp
index 274c206b4f1..bfc7b270b2d 100644
--- a/src/library/basetracktablemodel.cpp
+++ b/src/library/basetracktablemodel.cpp
@@ -3,17 +3,17 @@
 #include <QGuiApplication>
 #include <QScreen>
 
-#include "library/bpmdelegate.h"
-#include "library/colordelegate.h"
 #include "library/coverartcache.h"
-#include "library/coverartdelegate.h"
 #include "library/dao/trackschema.h"
-#include "library/locationdelegate.h"
-#include "library/multilineeditdelegate.h"
-#include "library/playcountdelegate.h"
-#include "library/previewbuttondelegate.h"
-#include "library/stardelegate.h"
 #include "library/starrating.h"
+#include "library/tabledelegates/bpmdelegate.h"
+#include "library/tabledelegates/colordelegate.h"
+#include "library/tabledelegates/coverartdelegate.h"
+#include "library/tabledelegates/locationdelegate.h"
+#include "library/tabledelegates/multilineeditdelegate.h"
+#include "library/tabledelegates/playcountdelegate.h"
+#include "library/tabledelegates/previewbuttondelegate.h"
+#include "library/tabledelegates/stardelegate.h"
 #include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"
 #include "mixer/playerinfo.h"
diff --git a/src/library/browse/browsetablemodel.cpp b/src/library/browse/browsetablemodel.cpp
index 561b2a3ecac..0095d8f25fe 100644
--- a/src/library/browse/browsetablemodel.cpp
+++ b/src/library/browse/browsetablemodel.cpp
@@ -6,7 +6,7 @@
 
 #include "library/browse/browsetablemodel.h"
 #include "library/browse/browsethread.h"
-#include "library/previewbuttondelegate.h"
+#include "library/tabledelegates/previewbuttondelegate.h"
 #include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"
 #include "mixer/playerinfo.h"
diff --git a/src/library/bpmdelegate.cpp b/src/library/tabledelegates/bpmdelegate.cpp
similarity index 99%
rename from src/library/bpmdelegate.cpp
rename to src/library/tabledelegates/bpmdelegate.cpp
index 1c05f578218..9b54cde6027 100644
--- a/src/library/bpmdelegate.cpp
+++ b/src/library/tabledelegates/bpmdelegate.cpp
@@ -1,4 +1,4 @@
-#include "library/bpmdelegate.h"
+#include "library/tabledelegates/bpmdelegate.h"
 
 #include <QCheckBox>
 #include <QDoubleSpinBox>
diff --git a/src/library/bpmdelegate.h b/src/library/tabledelegates/bpmdelegate.h
similarity index 88%
rename from src/library/bpmdelegate.h
rename to src/library/tabledelegates/bpmdelegate.h
index f0251199255..38a398898dc 100644
--- a/src/library/bpmdelegate.h
+++ b/src/library/tabledelegates/bpmdelegate.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "library/tableitemdelegate.h"
+#include "library/tabledelegates/tableitemdelegate.h"
 
 class QCheckBox;
 
diff --git a/src/library/colordelegate.cpp b/src/library/tabledelegates/colordelegate.cpp
similarity index 94%
rename from src/library/colordelegate.cpp
rename to src/library/tabledelegates/colordelegate.cpp
index 4808a0ee9ca..76400bd6ee8 100644
--- a/src/library/colordelegate.cpp
+++ b/src/library/tabledelegates/colordelegate.cpp
@@ -1,4 +1,4 @@
-#include "library/colordelegate.h"
+#include "library/tabledelegates/colordelegate.h"
 
 #include <QPainter>
 #include <QStyle>
diff --git a/src/library/colordelegate.h b/src/library/tabledelegates/colordelegate.h
similarity index 86%
rename from src/library/colordelegate.h
rename to src/library/tabledelegates/colordelegate.h
index e0b0b9889e1..7309b560a0e 100644
--- a/src/library/colordelegate.h
+++ b/src/library/tabledelegates/colordelegate.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "library/tableitemdelegate.h"
+#include "library/tabledelegates/tableitemdelegate.h"
 
 class QModelIndex;
 class QPainter;
diff --git a/src/library/coverartdelegate.cpp b/src/library/tabledelegates/coverartdelegate.cpp
similarity index 99%
rename from src/library/coverartdelegate.cpp
rename to src/library/tabledelegates/coverartdelegate.cpp
index 7dbeeff33b5..781dbc48292 100644
--- a/src/library/coverartdelegate.cpp
+++ b/src/library/tabledelegates/coverartdelegate.cpp
@@ -1,4 +1,4 @@
-#include "library/coverartdelegate.h"
+#include "library/tabledelegates/coverartdelegate.h"
 
 #include <QPainter>
 #include <QTableView>
diff --git a/src/library/coverartdelegate.h b/src/library/tabledelegates/coverartdelegate.h
similarity index 97%
rename from src/library/coverartdelegate.h
rename to src/library/tabledelegates/coverartdelegate.h
index 84c69c5604a..f2e5b338915 100644
--- a/src/library/coverartdelegate.h
+++ b/src/library/tabledelegates/coverartdelegate.h
@@ -3,7 +3,7 @@
 #include <QList>
 
 #include "library/coverart.h"
-#include "library/tableitemdelegate.h"
+#include "library/tabledelegates/tableitemdelegate.h"
 #include "track/track_decl.h"
 #include "util/cache.h"
 
diff --git a/src/library/locationdelegate.cpp b/src/library/tabledelegates/locationdelegate.cpp
similarity index 94%
rename from src/library/locationdelegate.cpp
rename to src/library/tabledelegates/locationdelegate.cpp
index 43438d58e6e..9fa79339c8e 100644
--- a/src/library/locationdelegate.cpp
+++ b/src/library/tabledelegates/locationdelegate.cpp
@@ -1,4 +1,4 @@
-#include "library/locationdelegate.h"
+#include "library/tabledelegates/locationdelegate.h"
 
 #include <QPainter>
 
diff --git a/src/library/locationdelegate.h b/src/library/tabledelegates/locationdelegate.h
similarity index 86%
rename from src/library/locationdelegate.h
rename to src/library/tabledelegates/locationdelegate.h
index 9fb698dab21..43fd03cc79d 100644
--- a/src/library/locationdelegate.h
+++ b/src/library/tabledelegates/locationdelegate.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "library/tableitemdelegate.h"
-
+#include "library/tabledelegates/tableitemdelegate.h"
 
 class LocationDelegate : public TableItemDelegate {
     Q_OBJECT
diff --git a/src/library/multilineeditdelegate.cpp b/src/library/tabledelegates/multilineeditdelegate.cpp
similarity index 99%
rename from src/library/multilineeditdelegate.cpp
rename to src/library/tabledelegates/multilineeditdelegate.cpp
index e7c0fa7ae10..3dd6904fc8d 100644
--- a/src/library/multilineeditdelegate.cpp
+++ b/src/library/tabledelegates/multilineeditdelegate.cpp
@@ -1,4 +1,4 @@
-#include "library/multilineeditdelegate.h"
+#include "library/tabledelegates/multilineeditdelegate.h"
 
 #include <QAbstractTextDocumentLayout>
 #include <QScrollBar>
diff --git a/src/library/multilineeditdelegate.h b/src/library/tabledelegates/multilineeditdelegate.h
similarity index 96%
rename from src/library/multilineeditdelegate.h
rename to src/library/tabledelegates/multilineeditdelegate.h
index 692598cc422..d46bd048c26 100644
--- a/src/library/multilineeditdelegate.h
+++ b/src/library/tabledelegates/multilineeditdelegate.h
@@ -2,7 +2,7 @@
 
 #include <QPlainTextEdit>
 
-#include "library/tableitemdelegate.h"
+#include "library/tabledelegates/tableitemdelegate.h"
 
 /// A QPlainTextEdit to show all content lines in a scrollable view.
 /// * finish editing with Return key, like QLineEdit used for other text columns
diff --git a/src/library/playcountdelegate.cpp b/src/library/tabledelegates/playcountdelegate.cpp
similarity index 95%
rename from src/library/playcountdelegate.cpp
rename to src/library/tabledelegates/playcountdelegate.cpp
index 4f25aaf8833..53bac452dc1 100644
--- a/src/library/playcountdelegate.cpp
+++ b/src/library/tabledelegates/playcountdelegate.cpp
@@ -1,4 +1,4 @@
-#include "library/playcountdelegate.h"
+#include "library/tabledelegates/playcountdelegate.h"
 
 #include <QCheckBox>
 #include <QPainter>
diff --git a/src/library/playcountdelegate.h b/src/library/tabledelegates/playcountdelegate.h
similarity index 87%
rename from src/library/playcountdelegate.h
rename to src/library/tabledelegates/playcountdelegate.h
index 87f3705ed57..ce791f733c2 100644
--- a/src/library/playcountdelegate.h
+++ b/src/library/tabledelegates/playcountdelegate.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "library/tableitemdelegate.h"
+#include "library/tabledelegates/tableitemdelegate.h"
 
 class QCheckBox;
 
diff --git a/src/library/previewbuttondelegate.cpp b/src/library/tabledelegates/previewbuttondelegate.cpp
similarity index 99%
rename from src/library/previewbuttondelegate.cpp
rename to src/library/tabledelegates/previewbuttondelegate.cpp
index ca565cb185b..110b84d69fa 100644
--- a/src/library/previewbuttondelegate.cpp
+++ b/src/library/tabledelegates/previewbuttondelegate.cpp
@@ -1,4 +1,4 @@
-#include "library/previewbuttondelegate.h"
+#include "library/tabledelegates/previewbuttondelegate.h"
 
 #include <QPainter>
 #include <QPushButton>
diff --git a/src/library/previewbuttondelegate.h b/src/library/tabledelegates/previewbuttondelegate.h
similarity index 97%
rename from src/library/previewbuttondelegate.h
rename to src/library/tabledelegates/previewbuttondelegate.h
index fdd1f0f06d2..6bb37e514f9 100644
--- a/src/library/previewbuttondelegate.h
+++ b/src/library/tabledelegates/previewbuttondelegate.h
@@ -2,7 +2,7 @@
 
 #include <QPushButton>
 
-#include "library/tableitemdelegate.h"
+#include "library/tabledelegates/tableitemdelegate.h"
 #include "track/track_decl.h"
 #include "util/parented_ptr.h"
 
diff --git a/src/library/stardelegate.cpp b/src/library/tabledelegates/stardelegate.cpp
similarity index 95%
rename from src/library/stardelegate.cpp
rename to src/library/tabledelegates/stardelegate.cpp
index 2b1a2fb0c22..62743016af8 100644
--- a/src/library/stardelegate.cpp
+++ b/src/library/tabledelegates/stardelegate.cpp
@@ -1,10 +1,10 @@
-#include "library/stardelegate.h"
+#include "library/tabledelegates/stardelegate.h"
 
 #include <QTableView>
 
-#include "library/stareditor.h"
 #include "library/starrating.h"
-#include "library/tableitemdelegate.h"
+#include "library/tabledelegates/stareditor.h"
+#include "library/tabledelegates/tableitemdelegate.h"
 #include "moc_stardelegate.cpp"
 
 StarDelegate::StarDelegate(QTableView* pTableView)
diff --git a/src/library/stardelegate.h b/src/library/tabledelegates/stardelegate.h
similarity index 95%
rename from src/library/stardelegate.h
rename to src/library/tabledelegates/stardelegate.h
index 3ac6bd7fd3a..39d0f1457d9 100644
--- a/src/library/stardelegate.h
+++ b/src/library/tabledelegates/stardelegate.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "library/tableitemdelegate.h"
+#include "library/tabledelegates/tableitemdelegate.h"
 
 class StarDelegate : public TableItemDelegate {
     Q_OBJECT
diff --git a/src/library/stareditor.cpp b/src/library/tabledelegates/stareditor.cpp
similarity index 98%
rename from src/library/stareditor.cpp
rename to src/library/tabledelegates/stareditor.cpp
index 42abedd7609..a4e1ba78a6c 100644
--- a/src/library/stareditor.cpp
+++ b/src/library/tabledelegates/stareditor.cpp
@@ -1,4 +1,4 @@
-#include "library/stareditor.h"
+#include "library/tabledelegates/stareditor.h"
 
 #include <QItemSelectionModel>
 #include <QMouseEvent>
@@ -6,7 +6,7 @@
 #include <QTableView>
 
 #include "library/starrating.h"
-#include "library/tableitemdelegate.h"
+#include "library/tabledelegates/tableitemdelegate.h"
 #include "moc_stareditor.cpp"
 
 // We enable mouse tracking on the widget so we can follow the cursor even
diff --git a/src/library/stareditor.h b/src/library/tabledelegates/stareditor.h
similarity index 100%
rename from src/library/stareditor.h
rename to src/library/tabledelegates/stareditor.h
diff --git a/src/library/tableitemdelegate.cpp b/src/library/tabledelegates/tableitemdelegate.cpp
similarity index 98%
rename from src/library/tableitemdelegate.cpp
rename to src/library/tabledelegates/tableitemdelegate.cpp
index f044e4a664c..229b08caa81 100644
--- a/src/library/tableitemdelegate.cpp
+++ b/src/library/tabledelegates/tableitemdelegate.cpp
@@ -1,4 +1,4 @@
-#include "library/tableitemdelegate.h"
+#include "library/tabledelegates/tableitemdelegate.h"
 
 #include <QPainter>
 
diff --git a/src/library/tableitemdelegate.h b/src/library/tabledelegates/tableitemdelegate.h
similarity index 100%
rename from src/library/tableitemdelegate.h
rename to src/library/tabledelegates/tableitemdelegate.h