diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index 7225914a789..87bea740437 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -221,11 +221,9 @@ include_directories(${maxLibQt_SOURCE_DIR}/widgets)
 set(companion_NAMES
   apppreferencesdialog
   helpers_html
-  labels
   logsdialog
   mainwindow
   mdichild
-  modelslist
   profilechooser
   dialogs/filesyncdialog
   )
diff --git a/companion/src/datamodels/CMakeLists.txt b/companion/src/datamodels/CMakeLists.txt
index 9070de77fa3..e4096522dd7 100644
--- a/companion/src/datamodels/CMakeLists.txt
+++ b/companion/src/datamodels/CMakeLists.txt
@@ -5,6 +5,8 @@ set(${PROJECT_NAME}_NAMES
   compounditemmodels
   filtereditemmodels
   itemmodeleventhandler
+  labels
+  modelslist
 )
 
 AddHeadersSources()
diff --git a/companion/src/labels.cpp b/companion/src/datamodels/labels.cpp
similarity index 100%
rename from companion/src/labels.cpp
rename to companion/src/datamodels/labels.cpp
diff --git a/companion/src/labels.h b/companion/src/datamodels/labels.h
similarity index 100%
rename from companion/src/labels.h
rename to companion/src/datamodels/labels.h
diff --git a/companion/src/modelslist.cpp b/companion/src/datamodels/modelslist.cpp
similarity index 100%
rename from companion/src/modelslist.cpp
rename to companion/src/datamodels/modelslist.cpp
diff --git a/companion/src/modelslist.h b/companion/src/datamodels/modelslist.h
similarity index 100%
rename from companion/src/modelslist.h
rename to companion/src/datamodels/modelslist.h