diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f70e4be8e..078d2b2f6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -48,7 +48,7 @@ add_library(neochat STATIC
     texthandler.cpp
     logger.cpp
     stickermodel.cpp
-    imagepacksmodel.cpp
+    models/imagepacksmodel.cpp
     events/imagepackevent.cpp
     events/joinrulesevent.cpp
     events/stickerevent.cpp
diff --git a/src/main.cpp b/src/main.cpp
index 92b382ee0..5160c6875 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -44,7 +44,6 @@
 #include "clipboard.h"
 #include "controller.h"
 #include "filetypesingleton.h"
-#include "imagepacksmodel.h"
 #include "linkpreviewer.h"
 #include "logger.h"
 #include "login.h"
@@ -53,6 +52,7 @@
 #include "models/customemojimodel.h"
 #include "models/devicesmodel.h"
 #include "models/emojimodel.h"
+#include "models/imagepacksmodel.h"
 #include "models/keywordnotificationrulemodel.h"
 #include "models/messageeventmodel.h"
 #include "models/messagefiltermodel.h"
diff --git a/src/imagepacksmodel.cpp b/src/models/imagepacksmodel.cpp
similarity index 96%
rename from src/imagepacksmodel.cpp
rename to src/models/imagepacksmodel.cpp
index 14b5fc7ec..36ca1ac1c 100644
--- a/src/imagepacksmodel.cpp
+++ b/src/models/imagepacksmodel.cpp
@@ -42,7 +42,12 @@ QVariant ImagePacksModel::data(const QModelIndex &index, int role) const
 
 QHash<int, QByteArray> ImagePacksModel::roleNames() const
 {
-    return {{DisplayNameRole, "displayName"}, {AvatarUrlRole, "avatarUrl"}, {AttributionRole, "attribution"}, {IdRole, "id"},};
+    return {
+        {DisplayNameRole, "displayName"},
+        {AvatarUrlRole, "avatarUrl"},
+        {AttributionRole, "attribution"},
+        {IdRole, "id"},
+    };
 }
 
 NeoChatRoom *ImagePacksModel::room() const
diff --git a/src/imagepacksmodel.h b/src/models/imagepacksmodel.h
similarity index 100%
rename from src/imagepacksmodel.h
rename to src/models/imagepacksmodel.h
diff --git a/src/stickermodel.cpp b/src/stickermodel.cpp
index 501ef69c5..e16a556f4 100644
--- a/src/stickermodel.cpp
+++ b/src/stickermodel.cpp
@@ -3,7 +3,7 @@
 
 #include "stickermodel.h"
 
-#include "imagepacksmodel.h"
+#include "models/imagepacksmodel.h"
 
 using namespace Quotient;