diff --git a/qtox.pro b/qtox.pro
index 1cabf8808..f603deae8 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -120,7 +120,7 @@ HEADERS  += src/widget/form/addfriendform.h \
     src/friendlist.h \
     src/misc/cdata.h \
     src/misc/cstring.h \
-    src/camera.h \
+    src/video/camera.h \
     src/widget/netcamview.h \
     src/misc/smileypack.h \
     src/widget/emoticonswidget.h \
@@ -142,8 +142,8 @@ HEADERS  += src/widget/form/addfriendform.h \
     src/widget/tool/chatactions/actionaction.h \
     src/widget/tool/chatactions/alertaction.h \
     src/widget/maskablepixmapwidget.h \
-    src/videosource.h \
-    src/cameraworker.h \
+    src/video/videosource.h \
+    src/video/cameraworker.h \
     src/widget/videosurface.h \
     src/widget/form/loadhistorydialog.h \
     src/historykeeper.h \
@@ -178,7 +178,7 @@ SOURCES += \
     src/misc/settings.cpp \
     src/misc/cdata.cpp \
     src/misc/cstring.cpp \
-    src/camera.cpp \
+    src/video/camera.cpp \
     src/widget/netcamview.cpp \
     src/misc/smileypack.cpp \
     src/widget/emoticonswidget.cpp \
@@ -199,7 +199,7 @@ SOURCES += \
     src/widget/tool/chatactions/actionaction.cpp \
     src/widget/tool/chatactions/alertaction.cpp \
     src/widget/maskablepixmapwidget.cpp \
-    src/cameraworker.cpp \
+    src/video/cameraworker.cpp \
     src/widget/videosurface.cpp \
     src/widget/form/loadhistorydialog.cpp \
     src/historykeeper.cpp \
@@ -208,5 +208,5 @@ SOURCES += \
     src/misc/db/encrypteddb.cpp \
     src/widget/form/inputpassworddialog.cpp \
     src/widget/form/setpassworddialog.cpp \
-    src/netvideosource.cpp \
+    src/video/netvideosource.cpp \
     src/widget/form/tabcompleter.cpp
diff --git a/src/coreav.cpp b/src/coreav.cpp
index 923883443..5185a0246 100644
--- a/src/coreav.cpp
+++ b/src/coreav.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "core.h"
-#include "camera.h"
+#include "video/camera.h"
 #include <QDebug>
 #include <QTimer>
 
diff --git a/src/coreav.h b/src/coreav.h
index ae58a9da7..cdf4cfe2e 100644
--- a/src/coreav.h
+++ b/src/coreav.h
@@ -2,7 +2,7 @@
 #define COREAV_H
 
 #include <tox/toxav.h>
-#include "netvideosource.h"
+#include "video/netvideosource.h"
 
 #if defined(__APPLE__) && defined(__MACH__)
  #include <OpenAL/al.h>
diff --git a/src/camera.cpp b/src/video/camera.cpp
similarity index 99%
rename from src/camera.cpp
rename to src/video/camera.cpp
index 48fcdcd85..ca972bc87 100644
--- a/src/camera.cpp
+++ b/src/video/camera.cpp
@@ -15,7 +15,7 @@
 */
 
 #include "camera.h"
-#include "src/cameraworker.h"
+#include "src/video/cameraworker.h"
 #include <QDebug>
 #include <QThread>
 #include <QMutexLocker>
diff --git a/src/camera.h b/src/video/camera.h
similarity index 98%
rename from src/camera.h
rename to src/video/camera.h
index 0573b0c20..e064d95b7 100644
--- a/src/camera.h
+++ b/src/video/camera.h
@@ -22,7 +22,7 @@
 #include <QMutex>
 #include "vpx/vpx_image.h"
 #include "opencv2/opencv.hpp"
-#include "src/videosource.h"
+#include "src/video/videosource.h"
 
 class CameraWorker;
 
diff --git a/src/cameraworker.cpp b/src/video/cameraworker.cpp
similarity index 100%
rename from src/cameraworker.cpp
rename to src/video/cameraworker.cpp
diff --git a/src/cameraworker.h b/src/video/cameraworker.h
similarity index 100%
rename from src/cameraworker.h
rename to src/video/cameraworker.h
diff --git a/src/netvideosource.cpp b/src/video/netvideosource.cpp
similarity index 100%
rename from src/netvideosource.cpp
rename to src/video/netvideosource.cpp
diff --git a/src/netvideosource.h b/src/video/netvideosource.h
similarity index 100%
rename from src/netvideosource.h
rename to src/video/netvideosource.h
diff --git a/src/videosource.h b/src/video/videosource.h
similarity index 100%
rename from src/videosource.h
rename to src/video/videosource.h
diff --git a/src/widget/form/settings/avform.h b/src/widget/form/settings/avform.h
index 1d19d7c7b..b00605d46 100644
--- a/src/widget/form/settings/avform.h
+++ b/src/widget/form/settings/avform.h
@@ -19,7 +19,7 @@
 
 #include "genericsettings.h"
 #include "src/widget/videosurface.h"
-#include "src/camera.h"
+#include "src/video/camera.h"
 #include <QGroupBox>
 #include <QVBoxLayout>
 #include <QPushButton>
diff --git a/src/widget/form/settingswidget.cpp b/src/widget/form/settingswidget.cpp
index 8aa9bf986..00c46c514 100644
--- a/src/widget/form/settingswidget.cpp
+++ b/src/widget/form/settingswidget.cpp
@@ -17,7 +17,7 @@
 #include "settingswidget.h"
 #include "src/widget/widget.h"
 #include "ui_mainwindow.h"
-#include "src/camera.h"
+#include "src/video/camera.h"
 #include "src/widget/form/settings/generalform.h"
 #include "src/widget/form/settings/identityform.h"
 #include "src/widget/form/settings/privacyform.h"
diff --git a/src/widget/videosurface.cpp b/src/widget/videosurface.cpp
index aa4b1f2eb..7d710d254 100644
--- a/src/widget/videosurface.cpp
+++ b/src/widget/videosurface.cpp
@@ -15,13 +15,11 @@
 */
 
 #include "videosurface.h"
-#include "src/camera.h"
+#include "src/video/camera.h"
 #include <QTimer>
-#include <opencv2/opencv.hpp>
 #include <QOpenGLBuffer>
 #include <QOpenGLShaderProgram>
 #include <QDebug>
-#include <QElapsedTimer>
 
 VideoSurface::VideoSurface(QWidget* parent)
     : QGLWidget(QGLFormat(QGL::SampleBuffers | QGL::SingleBuffer), parent)
diff --git a/src/widget/videosurface.h b/src/widget/videosurface.h
index cf84df559..18bfd11c4 100644
--- a/src/widget/videosurface.h
+++ b/src/widget/videosurface.h
@@ -19,7 +19,7 @@
 
 #include <QGLWidget>
 #include <QMutex>
-#include "src/videosource.h"
+#include "src/video/videosource.h"
 
 class QOpenGLBuffer;
 class QOpenGLShaderProgram;
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index 428163624..67f13a4c6 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -28,7 +28,7 @@
 #include "form/groupchatform.h"
 #include "src/misc/style.h"
 #include "friendlistwidget.h"
-#include "src/camera.h"
+#include "src/video/camera.h"
 #include "form/chatform.h"
 #include "maskablepixmapwidget.h"
 #include <QMessageBox>