diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 078d2b2f6..6a9b46680 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,7 +47,7 @@ add_library(neochat STATIC
     models/searchmodel.cpp
     texthandler.cpp
     logger.cpp
-    stickermodel.cpp
+    models/stickermodel.cpp
     models/imagepacksmodel.cpp
     events/imagepackevent.cpp
     events/joinrulesevent.cpp
diff --git a/src/main.cpp b/src/main.cpp
index 5160c6875..c8b6a0dfc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -74,9 +74,9 @@
 #include "pollhandler.h"
 #endif
 #include "models/statefiltermodel.h"
+#include "models/stickermodel.h"
 #include "roommanager.h"
 #include "spacehierarchycache.h"
-#include "stickermodel.h"
 #include "urlhelper.h"
 #include "windowcontroller.h"
 #ifdef QUOTIENT_07
diff --git a/src/stickermodel.cpp b/src/models/stickermodel.cpp
similarity index 99%
rename from src/stickermodel.cpp
rename to src/models/stickermodel.cpp
index e16a556f4..88f5e5ca8 100644
--- a/src/stickermodel.cpp
+++ b/src/models/stickermodel.cpp
@@ -9,7 +9,8 @@ using namespace Quotient;
 
 StickerModel::StickerModel(QObject *parent)
     : QAbstractListModel(parent)
-{}
+{
+}
 
 int StickerModel::rowCount(const QModelIndex &index) const
 {
diff --git a/src/stickermodel.h b/src/models/stickermodel.h
similarity index 100%
rename from src/stickermodel.h
rename to src/models/stickermodel.h