diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5f6c5db3c..95dc3b39d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,11 +30,9 @@ add_library(neochat STATIC
     models/devicesmodel.cpp
     filetypesingleton.cpp
     login.cpp
-    stickerevent.cpp
     models/webshortcutmodel.cpp
     blurhash.cpp
     blurhashimageprovider.cpp
-    joinrulesevent.cpp
     models/collapsestateproxymodel.cpp
     urlhelper.cpp
     windowcontroller.cpp
@@ -49,9 +47,11 @@ add_library(neochat STATIC
     models/searchmodel.cpp
     texthandler.cpp
     logger.cpp
-    imagepackevent.cpp
     stickermodel.cpp
     imagepacksmodel.cpp
+    events/imagepackevent.cpp
+    events/joinrulesevent.cpp
+    events/stickerevent.cpp
 )
 
 add_executable(neochat-app
@@ -67,7 +67,7 @@ target_link_libraries(neochat-app PRIVATE
 
 if(Quotient_VERSION_MINOR GREATER 6)
     target_compile_definitions(neochat PUBLIC QUOTIENT_07)
-    target_sources(neochat PRIVATE pollevent.cpp pollhandler.cpp)
+    target_sources(neochat PRIVATE events/pollevent.cpp pollhandler.cpp)
 else()
     target_compile_definitions(neochat PUBLIC QUOTIENT_VERSION=\"${Quotient_VERSION}\")
     target_sources(neochat PRIVATE neochataccountregistry.cpp)
diff --git a/src/imagepackevent.cpp b/src/events/imagepackevent.cpp
similarity index 93%
rename from src/imagepackevent.cpp
rename to src/events/imagepackevent.cpp
index 6539983f9..609b6e8df 100644
--- a/src/imagepackevent.cpp
+++ b/src/events/imagepackevent.cpp
@@ -8,7 +8,7 @@ using namespace Quotient;
 
 ImagePackEventContent::ImagePackEventContent(const QJsonObject &json)
 {
-    if(json.contains(QStringLiteral("pack"))) {
+    if (json.contains(QStringLiteral("pack"))) {
         pack = ImagePackEventContent::Pack{
             fromJson<Omittable<QString>>(json["pack"].toObject()["display_name"]),
 #ifdef QUOTIENT_07
@@ -49,6 +49,7 @@ ImagePackEventContent::ImagePackEventContent(const QJsonObject &json)
     }
 }
 
-void ImagePackEventContent::fillJson(QJsonObject* o) const {
+void ImagePackEventContent::fillJson(QJsonObject *o) const
+{
     // TODO
 }
diff --git a/src/imagepackevent.h b/src/events/imagepackevent.h
similarity index 100%
rename from src/imagepackevent.h
rename to src/events/imagepackevent.h
diff --git a/src/joinrulesevent.cpp b/src/events/joinrulesevent.cpp
similarity index 100%
rename from src/joinrulesevent.cpp
rename to src/events/joinrulesevent.cpp
diff --git a/src/joinrulesevent.h b/src/events/joinrulesevent.h
similarity index 100%
rename from src/joinrulesevent.h
rename to src/events/joinrulesevent.h
diff --git a/src/pollevent.cpp b/src/events/pollevent.cpp
similarity index 100%
rename from src/pollevent.cpp
rename to src/events/pollevent.cpp
diff --git a/src/pollevent.h b/src/events/pollevent.h
similarity index 100%
rename from src/pollevent.h
rename to src/events/pollevent.h
diff --git a/src/stickerevent.cpp b/src/events/stickerevent.cpp
similarity index 100%
rename from src/stickerevent.cpp
rename to src/events/stickerevent.cpp
diff --git a/src/stickerevent.h b/src/events/stickerevent.h
similarity index 100%
rename from src/stickerevent.h
rename to src/events/stickerevent.h
diff --git a/src/imagepacksmodel.cpp b/src/imagepacksmodel.cpp
index cc954d6fb..8024b5542 100644
--- a/src/imagepacksmodel.cpp
+++ b/src/imagepacksmodel.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #include "imagepacksmodel.h"
-#include "imagepackevent.h"
 #include "neochatroom.h"
 
 #include <KLocalizedString>
diff --git a/src/imagepacksmodel.h b/src/imagepacksmodel.h
index d02866f08..a73d2b20b 100644
--- a/src/imagepacksmodel.h
+++ b/src/imagepacksmodel.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "imagepackevent.h"
+#include "events/imagepackevent.h"
 #include <QAbstractListModel>
 #include <QPointer>
 #include <QVector>
diff --git a/src/models/messageeventmodel.cpp b/src/models/messageeventmodel.cpp
index 007c07edc..fcc6d5d94 100644
--- a/src/models/messageeventmodel.cpp
+++ b/src/models/messageeventmodel.cpp
@@ -14,9 +14,9 @@
 #include <user.h>
 
 #ifdef QUOTIENT_07
-#include "pollevent.h"
+#include "events/pollevent.h"
 #endif
-#include "stickerevent.h"
+#include "events/stickerevent.h"
 
 #include <QDebug>
 #include <QGuiApplication>
diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp
index 3cd14984b..acd2b713f 100644
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -38,16 +38,16 @@
 #include <qt_connection_util.h>
 
 #include "controller.h"
-#include "joinrulesevent.h"
+#include "events/joinrulesevent.h"
 #include "neochatconfig.h"
 #include "neochatuser.h"
 #include "notificationsmanager.h"
 #ifdef QUOTIENT_07
-#include "pollevent.h"
+#include "events/pollevent.h"
 #include "pollhandler.h"
 #endif
+#include "events/stickerevent.h"
 #include "filetransferpseudojob.h"
-#include "stickerevent.h"
 #include "texthandler.h"
 
 #ifndef Q_OS_ANDROID
diff --git a/src/pollhandler.cpp b/src/pollhandler.cpp
index 76051d7cc..6a5440d74 100644
--- a/src/pollhandler.cpp
+++ b/src/pollhandler.cpp
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #include "pollhandler.h"
+#include "events/pollevent.h"
 #include "neochatroom.h"
-#include "pollevent.h"
 #include <algorithm>
 #include <csapi/relations.h>
 #include <events/roompowerlevelsevent.h>
diff --git a/src/stickermodel.cpp b/src/stickermodel.cpp
index 021d8be1e..501ef69c5 100644
--- a/src/stickermodel.cpp
+++ b/src/stickermodel.cpp
@@ -3,7 +3,6 @@
 
 #include "stickermodel.h"
 
-#include "imagepackevent.h"
 #include "imagepacksmodel.h"
 
 using namespace Quotient;
diff --git a/src/stickermodel.h b/src/stickermodel.h
index b74c311d8..5ce223e7a 100644
--- a/src/stickermodel.h
+++ b/src/stickermodel.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "imagepackevent.h"
+#include "events/imagepackevent.h"
 #include "neochatroom.h"
 #include <QAbstractListModel>
 #include <QObject>