From 20f254651dfd27321781393cebbbe8399059a5e4 Mon Sep 17 00:00:00 2001
From: tux3 <barrdetwix@gmail.com>
Date: Sat, 6 Jun 2015 01:44:47 +0200
Subject: [PATCH] Reorganize files

---
 qtox.pro                                      | 114 +++++++++---------
 src/{ => audio}/audio.cpp                     |   0
 src/{ => audio}/audio.h                       |   0
 src/{ => audio}/audiofilterer.cpp             |   0
 src/{ => audio}/audiofilterer.h               |   0
 src/chatlog/chatlog.cpp                       |   2 +-
 src/chatlog/chatmessage.cpp                   |   6 +-
 src/chatlog/content/filetransferwidget.cpp    |   2 +-
 src/chatlog/content/filetransferwidget.ui     |   2 +-
 src/chatlog/customtextdocument.cpp            |   6 +-
 src/{misc => core}/cdata.cpp                  |   0
 src/{misc => core}/cdata.h                    |   0
 src/core/core.cpp                             |  16 +--
 src/core/coreav.cpp                           |   6 +-
 src/core/coreencryption.cpp                   |   8 +-
 src/core/corefile.cpp                         |   4 +-
 src/{misc => core}/cstring.cpp                |   0
 src/{misc => core}/cstring.h                  |   0
 src/friend.cpp                                |   2 +-
 src/friendlist.cpp                            |   2 +-
 src/ipc.cpp                                   |   2 +-
 src/{widget => }/loginscreen.ui               |   0
 src/main.cpp                                  |  14 +--
 src/{ => net}/autoupdate.cpp                  |   6 +-
 src/{ => net}/autoupdate.h                    |   0
 src/{ => net}/avatarbroadcaster.cpp           |   0
 src/{ => net}/avatarbroadcaster.h             |   0
 src/{ => net}/toxdns.cpp                      |   4 +-
 src/{ => net}/toxdns.h                        |   4 +-
 src/{ => net}/toxme.cpp                       |   0
 src/{ => net}/toxme.h                         |   2 +-
 src/{widget => net}/toxuri.cpp                |   4 +-
 src/{widget => net}/toxuri.h                  |   0
 src/nexus.cpp                                 |   4 +-
 src/{misc => persistence}/db/encrypteddb.cpp  |   2 +-
 src/{misc => persistence}/db/encrypteddb.h    |   0
 .../db/genericddinterface.cpp                 |   0
 .../db/genericddinterface.h                   |   0
 src/{misc => persistence}/db/plaindb.cpp      |   0
 src/{misc => persistence}/db/plaindb.h        |   0
 src/{ => persistence}/historykeeper.cpp       |   8 +-
 src/{ => persistence}/historykeeper.h         |   0
 src/{ => persistence}/offlinemsgengine.cpp    |   4 +-
 src/{ => persistence}/offlinemsgengine.h      |   0
 src/{ => persistence}/profile.cpp             |   5 +-
 src/{ => persistence}/profile.h               |   0
 src/{ => persistence}/profilelocker.cpp       |   2 +-
 src/{ => persistence}/profilelocker.h         |   0
 src/{misc => persistence}/serialize.cpp       |   2 +-
 src/{misc => persistence}/serialize.h         |   0
 src/{misc => persistence}/settings.cpp        |   6 +-
 src/{misc => persistence}/settings.h          |   0
 src/{misc => persistence}/smileypack.cpp      |   4 +-
 src/{misc => persistence}/smileypack.h        |   0
 src/{widget => persistence}/toxsave.cpp       |   4 +-
 src/{widget => persistence}/toxsave.h         |   0
 src/platform/autorun_win.cpp                  |   2 +-
 src/platform/autorun_xdg.cpp                  |   2 +-
 src/video/cameradevice.cpp                    |   2 +-
 src/{widget => video}/netcamview.cpp          |   2 +-
 src/{widget => video}/netcamview.h            |   0
 src/{widget => video}/videosurface.cpp        |   0
 src/{widget => video}/videosurface.h          |   0
 src/widget/androidgui.cpp                     |   2 +-
 src/widget/emoticonswidget.cpp                |   6 +-
 src/{misc => widget}/flowlayout.cpp           |   0
 src/{misc => widget}/flowlayout.h             |   0
 src/widget/form/addfriendform.cpp             |   8 +-
 src/widget/form/chatform.cpp                  |  18 +--
 src/widget/form/filesform.cpp                 |   2 +-
 src/widget/form/genericchatform.cpp           |   8 +-
 src/widget/form/groupchatform.cpp             |  10 +-
 src/widget/form/profileform.cpp               |  14 +--
 src/widget/form/profileform.h                 |   2 +-
 src/widget/form/profileform.ui                |   4 +-
 src/widget/form/settings/advancedform.cpp     |   8 +-
 src/widget/form/settings/avform.cpp           |   8 +-
 src/widget/form/settings/generalform.cpp      |  13 +-
 src/widget/form/settings/privacyform.cpp      |   6 +-
 src/widget/form/settingswidget.cpp            |   2 +-
 src/widget/friendwidget.cpp                   |   6 +-
 src/widget/genericchatroomwidget.cpp          |   6 +-
 src/widget/groupwidget.cpp                    |   4 +-
 src/widget/loginscreen.cpp                    |   8 +-
 src/{misc => widget}/qrwidget.cpp             |   0
 src/{misc => widget}/qrwidget.h               |   0
 src/{misc => widget}/style.cpp                |   2 +-
 src/{misc => widget}/style.h                  |   0
 src/widget/systemtrayicon.cpp                 |   2 +-
 src/widget/{ => tool}/callconfirmwidget.cpp   |   2 +-
 src/widget/{ => tool}/callconfirmwidget.h     |   0
 src/widget/tool/chattextedit.cpp              |   2 +-
 src/widget/{ => tool}/croppinglabel.cpp       |   0
 src/widget/{ => tool}/croppinglabel.h         |   0
 src/{ => widget}/translator.cpp               |   2 +-
 src/{ => widget}/translator.h                 |   0
 src/widget/widget.cpp                         |  14 +--
 97 files changed, 207 insertions(+), 207 deletions(-)
 rename src/{ => audio}/audio.cpp (100%)
 rename src/{ => audio}/audio.h (100%)
 rename src/{ => audio}/audiofilterer.cpp (100%)
 rename src/{ => audio}/audiofilterer.h (100%)
 rename src/{misc => core}/cdata.cpp (100%)
 rename src/{misc => core}/cdata.h (100%)
 rename src/{misc => core}/cstring.cpp (100%)
 rename src/{misc => core}/cstring.h (100%)
 rename src/{widget => }/loginscreen.ui (100%)
 rename src/{ => net}/autoupdate.cpp (99%)
 rename src/{ => net}/autoupdate.h (100%)
 rename src/{ => net}/avatarbroadcaster.cpp (100%)
 rename src/{ => net}/avatarbroadcaster.h (100%)
 rename src/{ => net}/toxdns.cpp (99%)
 rename src/{ => net}/toxdns.h (97%)
 rename src/{ => net}/toxme.cpp (100%)
 rename src/{ => net}/toxme.h (97%)
 rename src/{widget => net}/toxuri.cpp (98%)
 rename src/{widget => net}/toxuri.h (100%)
 rename src/{misc => persistence}/db/encrypteddb.cpp (99%)
 rename src/{misc => persistence}/db/encrypteddb.h (100%)
 rename src/{misc => persistence}/db/genericddinterface.cpp (100%)
 rename src/{misc => persistence}/db/genericddinterface.h (100%)
 rename src/{misc => persistence}/db/plaindb.cpp (100%)
 rename src/{misc => persistence}/db/plaindb.h (100%)
 rename src/{ => persistence}/historykeeper.cpp (98%)
 rename src/{ => persistence}/historykeeper.h (100%)
 rename src/{ => persistence}/offlinemsgengine.cpp (97%)
 rename src/{ => persistence}/offlinemsgengine.h (100%)
 rename src/{ => persistence}/profile.cpp (99%)
 rename src/{ => persistence}/profile.h (100%)
 rename src/{ => persistence}/profilelocker.cpp (98%)
 rename src/{ => persistence}/profilelocker.h (100%)
 rename src/{misc => persistence}/serialize.cpp (99%)
 rename src/{misc => persistence}/serialize.h (100%)
 rename src/{misc => persistence}/settings.cpp (99%)
 rename src/{misc => persistence}/settings.h (100%)
 rename src/{misc => persistence}/smileypack.cpp (98%)
 rename src/{misc => persistence}/smileypack.h (100%)
 rename src/{widget => persistence}/toxsave.cpp (97%)
 rename src/{widget => persistence}/toxsave.h (100%)
 rename src/{widget => video}/netcamview.cpp (97%)
 rename src/{widget => video}/netcamview.h (100%)
 rename src/{widget => video}/videosurface.cpp (100%)
 rename src/{widget => video}/videosurface.h (100%)
 rename src/{misc => widget}/flowlayout.cpp (100%)
 rename src/{misc => widget}/flowlayout.h (100%)
 rename src/{misc => widget}/qrwidget.cpp (100%)
 rename src/{misc => widget}/qrwidget.h (100%)
 rename src/{misc => widget}/style.cpp (99%)
 rename src/{misc => widget}/style.h (100%)
 rename src/widget/{ => tool}/callconfirmwidget.cpp (99%)
 rename src/widget/{ => tool}/callconfirmwidget.h (100%)
 rename src/widget/{ => tool}/croppinglabel.cpp (100%)
 rename src/widget/{ => tool}/croppinglabel.h (100%)
 rename src/{ => widget}/translator.cpp (98%)
 rename src/{ => widget}/translator.h (100%)

diff --git a/qtox.pro b/qtox.pro
index dc17182a5..25f2481ce 100644
--- a/qtox.pro
+++ b/qtox.pro
@@ -33,7 +33,7 @@ FORMS    += \
     src/chatlog/content/filetransferwidget.ui \
     src/widget/form/settings/advancedsettings.ui \
     src/android.ui \
-    src/widget/loginscreen.ui
+    src/loginscreen.ui
     
 CONFIG   += c++11
 
@@ -113,8 +113,8 @@ contains(JENKINS,YES) {
 }
 
 contains(DEFINES, QTOX_FILTER_AUDIO) {
-    HEADERS += src/audiofilterer.h
-    SOURCES += src/audiofilterer.cpp
+    HEADERS += src/audio/audiofilterer.h
+    SOURCES += src/audio/audiofilterer.cpp
 }
 
 contains(DEFINES, QTOX_PLATFORM_EXT) {
@@ -304,16 +304,16 @@ contains(ENABLE_SYSTRAY_GTK_BACKEND, NO) {
         src/group.h \
         src/grouplist.h \
         src/friendlist.h \
-        src/misc/smileypack.h \
+        src/persistence/smileypack.h \
         src/widget/emoticonswidget.h \
-        src/misc/style.h \
-        src/widget/croppinglabel.h \
+        src/widget/style.h \
+        src/widget/tool/croppinglabel.h \
         src/widget/maskablepixmapwidget.h \
-        src/widget/videosurface.h \
-        src/widget/toxuri.h \
-        src/toxdns.h \
-        src/widget/toxsave.h \
-        src/misc/serialize.h \
+        src/video/videosurface.h \
+        src/net/toxuri.h \
+        src/net/toxdns.h \
+        src/persistence/toxsave.h \
+        src/persistence/serialize.h \
         src/chatlog/chatlog.h \
         src/chatlog/chatline.h \
         src/chatlog/chatlinecontent.h \
@@ -329,7 +329,7 @@ contains(ENABLE_SYSTRAY_GTK_BACKEND, NO) {
         src/chatlog/content/timestamp.h \
         src/chatlog/documentcache.h \
         src/chatlog/pixmapcache.h \
-        src/offlinemsgengine.h \
+        src/persistence/offlinemsgengine.h \
         src/widget/form/addfriendform.h \
         src/widget/form/chatform.h \
         src/widget/form/groupchatform.h \
@@ -345,7 +345,7 @@ contains(ENABLE_SYSTRAY_GTK_BACKEND, NO) {
         src/widget/friendwidget.h \
         src/widget/groupwidget.h \
         src/widget/widget.h \
-        src/widget/netcamview.h \
+        src/video/netcamview.h \
         src/widget/friendlistwidget.h \
         src/widget/genericchatroomwidget.h \
         src/widget/form/genericchatform.h \
@@ -353,12 +353,12 @@ contains(ENABLE_SYSTRAY_GTK_BACKEND, NO) {
         src/widget/form/loadhistorydialog.h \
         src/widget/form/setpassworddialog.h \
         src/widget/form/tabcompleter.h \
-        src/misc/flowlayout.h \
+        src/widget/flowlayout.h \
         src/ipc.h \
-        src/autoupdate.h \
-        src/widget/callconfirmwidget.h \
+        src/net/autoupdate.h \
+        src/widget/tool/callconfirmwidget.h \
         src/widget/systemtrayicon.h \
-        src/misc/qrwidget.h \
+        src/widget/qrwidget.h \
         src/widget/systemtrayicon_private.h \
         src/widget/loginscreen.h
 
@@ -373,16 +373,16 @@ contains(ENABLE_SYSTRAY_GTK_BACKEND, NO) {
         src/widget/tool/chattextedit.cpp \
         src/widget/tool/friendrequestdialog.cpp \
         src/widget/widget.cpp \
-        src/widget/netcamview.cpp \
+        src/video/netcamview.cpp \
         src/widget/friendlistwidget.cpp \
         src/widget/adjustingscrollarea.cpp \
         src/widget/form/loadhistorydialog.cpp \
         src/widget/form/setpassworddialog.cpp \
         src/widget/form/tabcompleter.cpp \
-        src/misc/flowlayout.cpp \
+        src/widget/flowlayout.cpp \
         src/ipc.cpp \
-        src/autoupdate.cpp \
-        src/widget/callconfirmwidget.cpp \
+        src/net/autoupdate.cpp \
+        src/widget/tool/callconfirmwidget.cpp \
         src/widget/systemtrayicon.cpp \
         src/widget/groupwidget.cpp \
         src/widget/friendwidget.cpp \
@@ -393,16 +393,16 @@ contains(ENABLE_SYSTRAY_GTK_BACKEND, NO) {
         src/friendlist.cpp \
         src/group.cpp \
         src/grouplist.cpp \
-        src/misc/smileypack.cpp \
+        src/persistence/smileypack.cpp \
         src/widget/emoticonswidget.cpp \
-        src/misc/style.cpp \
-        src/widget/croppinglabel.cpp \
+        src/widget/style.cpp \
+        src/widget/tool/croppinglabel.cpp \
         src/widget/maskablepixmapwidget.cpp \
-        src/widget/videosurface.cpp \
-        src/widget/toxuri.cpp \
-        src/toxdns.cpp \
-        src/widget/toxsave.cpp \
-        src/misc/serialize.cpp \
+        src/video/videosurface.cpp \
+        src/net/toxuri.cpp \
+        src/net/toxdns.cpp \
+        src/persistence/toxsave.cpp \
+        src/persistence/serialize.cpp \
         src/chatlog/chatlog.cpp \
         src/chatlog/chatline.cpp \
         src/chatlog/chatlinecontent.cpp \
@@ -418,8 +418,8 @@ contains(ENABLE_SYSTRAY_GTK_BACKEND, NO) {
         src/chatlog/content/timestamp.cpp \
         src/chatlog/documentcache.cpp \
         src/chatlog/pixmapcache.cpp \
-        src/offlinemsgengine.cpp \
-        src/misc/qrwidget.cpp \
+        src/persistence/offlinemsgengine.cpp \
+        src/widget/qrwidget.cpp \
         src/widget/genericchatroomwidget.cpp \
         src/widget/loginscreen.cpp
 }
@@ -449,26 +449,26 @@ macx {
 }
 
 SOURCES += \
-    src/audio.cpp \
-    src/historykeeper.cpp \
+    src/audio/audio.cpp \
+    src/persistence/historykeeper.cpp \
     src/main.cpp \
     src/nexus.cpp \
-    src/misc/cdata.cpp \
-    src/misc/cstring.cpp \
-    src/misc/settings.cpp \
-    src/misc/db/genericddinterface.cpp \
-    src/misc/db/plaindb.cpp \
-    src/misc/db/encrypteddb.cpp \
+    src/core/cdata.cpp \
+    src/core/cstring.cpp \
+    src/persistence/settings.cpp \
+    src/persistence/db/genericddinterface.cpp \
+    src/persistence/db/plaindb.cpp \
+    src/persistence/db/encrypteddb.cpp \
     src/video/videoframe.cpp \
     src/widget/gui.cpp \
-    src/toxme.cpp \
+    src/net/toxme.cpp \
     src/core/core.cpp \
     src/core/coreav.cpp \
     src/core/coreencryption.cpp \
     src/core/corefile.cpp \
     src/core/corestructs.cpp \
-    src/profilelocker.cpp \
-    src/avatarbroadcaster.cpp \
+    src/persistence/profilelocker.cpp \
+    src/net/avatarbroadcaster.cpp \
     src/widget/tool/screenshotgrabber.cpp \
     src/widget/tool/screengrabberchooserrectitem.cpp \
     src/widget/tool/screengrabberoverlayitem.cpp \
@@ -479,30 +479,30 @@ SOURCES += \
     src/video/camerasource.cpp \
     src/video/corevideosource.cpp \
     src/core/toxid.cpp \
-    src/profile.cpp \
-    src/translator.cpp
+    src/persistence/profile.cpp \
+    src/widget/translator.cpp
 
 HEADERS += \
-    src/audio.h \
+    src/audio/audio.h \
     src/core/core.h \
     src/core/coreav.h \
     src/core/coredefines.h \
     src/core/corefile.h \
     src/core/corestructs.h \
-    src/historykeeper.h \
+    src/persistence/historykeeper.h \
     src/nexus.h \
-    src/misc/cdata.h \
-    src/misc/cstring.h \
-    src/misc/settings.h \
-    src/misc/db/genericddinterface.h \
-    src/misc/db/plaindb.h \
-    src/misc/db/encrypteddb.h \
+    src/core/cdata.h \
+    src/core/cstring.h \
+    src/persistence/settings.h \
+    src/persistence/db/genericddinterface.h \
+    src/persistence/db/plaindb.h \
+    src/persistence/db/encrypteddb.h \
     src/video/videoframe.h \
     src/video/videosource.h \
     src/widget/gui.h \
-    src/toxme.h \
-    src/profilelocker.h \
-    src/avatarbroadcaster.h \
+    src/net/toxme.h \
+    src/persistence/profilelocker.h \
+    src/net/avatarbroadcaster.h \
     src/widget/tool/screenshotgrabber.h \
     src/widget/tool/screengrabberchooserrectitem.h \
     src/widget/tool/screengrabberoverlayitem.h \
@@ -514,5 +514,5 @@ HEADERS += \
     src/video/corevideosource.h \
     src/video/videomode.h \
     src/core/toxid.h \
-    src/profile.h \
-    src/translator.h
+    src/persistence/profile.h \
+    src/widget/translator.h
diff --git a/src/audio.cpp b/src/audio/audio.cpp
similarity index 100%
rename from src/audio.cpp
rename to src/audio/audio.cpp
diff --git a/src/audio.h b/src/audio/audio.h
similarity index 100%
rename from src/audio.h
rename to src/audio/audio.h
diff --git a/src/audiofilterer.cpp b/src/audio/audiofilterer.cpp
similarity index 100%
rename from src/audiofilterer.cpp
rename to src/audio/audiofilterer.cpp
diff --git a/src/audiofilterer.h b/src/audio/audiofilterer.h
similarity index 100%
rename from src/audiofilterer.h
rename to src/audio/audiofilterer.h
diff --git a/src/chatlog/chatlog.cpp b/src/chatlog/chatlog.cpp
index baceb7555..c4735bd25 100644
--- a/src/chatlog/chatlog.cpp
+++ b/src/chatlog/chatlog.cpp
@@ -15,7 +15,7 @@
 #include "chatlog.h"
 #include "chatmessage.h"
 #include "chatlinecontent.h"
-#include "src/translator.h"
+#include "src/widget/translator.h"
 
 #include <QDebug>
 #include <QScrollBar>
diff --git a/src/chatlog/chatmessage.cpp b/src/chatlog/chatmessage.cpp
index 53f0dd23e..d0ce8384f 100644
--- a/src/chatlog/chatmessage.cpp
+++ b/src/chatlog/chatmessage.cpp
@@ -21,9 +21,9 @@
 #include "content/image.h"
 #include "content/notificationicon.h"
 
-#include "src/misc/settings.h"
-#include "src/misc/smileypack.h"
-#include "src/misc/style.h"
+#include "src/persistence/settings.h"
+#include "src/persistence/smileypack.h"
+#include "src/widget/style.h"
 
 #define NAME_COL_WIDTH 90.0
 #define TIME_COL_WIDTH 90.0
diff --git a/src/chatlog/content/filetransferwidget.cpp b/src/chatlog/content/filetransferwidget.cpp
index 409fa985a..95e0aa084 100644
--- a/src/chatlog/content/filetransferwidget.cpp
+++ b/src/chatlog/content/filetransferwidget.cpp
@@ -17,7 +17,7 @@
 
 #include "src/nexus.h"
 #include "src/core/core.h"
-#include "src/misc/style.h"
+#include "src/widget/style.h"
 #include "src/widget/widget.h"
 
 #include <QMouseEvent>
diff --git a/src/chatlog/content/filetransferwidget.ui b/src/chatlog/content/filetransferwidget.ui
index 795db2540..43a16adc5 100644
--- a/src/chatlog/content/filetransferwidget.ui
+++ b/src/chatlog/content/filetransferwidget.ui
@@ -435,7 +435,7 @@
   <customwidget>
    <class>CroppingLabel</class>
    <extends>QLabel</extends>
-   <header>src/widget/croppinglabel.h</header>
+   <header location="global">src/widget/tool/croppinglabel.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/chatlog/customtextdocument.cpp b/src/chatlog/customtextdocument.cpp
index 35fd35e1d..3b17b34f5 100644
--- a/src/chatlog/customtextdocument.cpp
+++ b/src/chatlog/customtextdocument.cpp
@@ -13,9 +13,9 @@
 */
 
 #include "customtextdocument.h"
-#include "../misc/settings.h"
-#include "../misc/smileypack.h"
-#include "../misc/style.h"
+#include "src/persistence/settings.h"
+#include "src/persistence/smileypack.h"
+#include "src/widget/style.h"
 
 #include <QIcon>
 #include <QDebug>
diff --git a/src/misc/cdata.cpp b/src/core/cdata.cpp
similarity index 100%
rename from src/misc/cdata.cpp
rename to src/core/cdata.cpp
diff --git a/src/misc/cdata.h b/src/core/cdata.h
similarity index 100%
rename from src/misc/cdata.h
rename to src/core/cdata.h
diff --git a/src/core/core.cpp b/src/core/core.cpp
index e2c2a2037..ea50015c5 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -16,15 +16,15 @@
 
 #include "core.h"
 #include "src/nexus.h"
-#include "src/misc/cdata.h"
-#include "src/misc/cstring.h"
-#include "src/misc/settings.h"
+#include "src/core/cdata.h"
+#include "src/core/cstring.h"
+#include "src/persistence/settings.h"
 #include "src/widget/gui.h"
-#include "src/historykeeper.h"
-#include "src/audio.h"
-#include "src/profilelocker.h"
-#include "src/avatarbroadcaster.h"
-#include "src/profile.h"
+#include "src/persistence/historykeeper.h"
+#include "src/audio/audio.h"
+#include "src/persistence/profilelocker.h"
+#include "src/net/avatarbroadcaster.h"
+#include "src/persistence/profile.h"
 #include "corefile.h"
 #include "src/video/camerasource.h"
 
diff --git a/src/core/coreav.cpp b/src/core/coreav.cpp
index b9ec4a371..1ad33eaf3 100644
--- a/src/core/coreav.cpp
+++ b/src/core/coreav.cpp
@@ -18,11 +18,11 @@
 #include "src/video/camerasource.h"
 #include "src/video/corevideosource.h"
 #include "src/video/videoframe.h"
-#include "src/audio.h"
+#include "src/audio/audio.h"
 #ifdef QTOX_FILTER_AUDIO
-#include "src/audiofilterer.h"
+#include "src/audio/audiofilterer.h"
 #endif
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include <assert.h>
 #include <QDebug>
 #include <QTimer>
diff --git a/src/core/coreencryption.cpp b/src/core/coreencryption.cpp
index 3e0f4e7bb..886c9ee8f 100644
--- a/src/core/coreencryption.cpp
+++ b/src/core/coreencryption.cpp
@@ -18,11 +18,11 @@
 
 #include "core.h"
 #include "src/widget/gui.h"
-#include "src/misc/settings.h"
-#include "src/misc/cstring.h"
-#include "src/historykeeper.h"
+#include "src/persistence/settings.h"
+#include "src/core/cstring.h"
+#include "src/persistence/historykeeper.h"
 #include "src/nexus.h"
-#include "src/profile.h"
+#include "src/persistence/profile.h"
 #include <tox/tox.h>
 #include <tox/toxencryptsave.h>
 #include <QApplication>
diff --git a/src/core/corefile.cpp b/src/core/corefile.cpp
index 083012160..024a4dee4 100644
--- a/src/core/corefile.cpp
+++ b/src/core/corefile.cpp
@@ -1,8 +1,8 @@
 #include "core.h"
 #include "corefile.h"
 #include "corestructs.h"
-#include "src/misc/cstring.h"
-#include "src/misc/settings.h"
+#include "src/core/cstring.h"
+#include "src/persistence/settings.h"
 #include <QDebug>
 #include <QFile>
 #include <QThread>
diff --git a/src/misc/cstring.cpp b/src/core/cstring.cpp
similarity index 100%
rename from src/misc/cstring.cpp
rename to src/core/cstring.cpp
diff --git a/src/misc/cstring.h b/src/core/cstring.h
similarity index 100%
rename from src/misc/cstring.h
rename to src/core/cstring.h
diff --git a/src/friend.cpp b/src/friend.cpp
index 70989635e..903f882e3 100644
--- a/src/friend.cpp
+++ b/src/friend.cpp
@@ -18,7 +18,7 @@
 #include "widget/form/chatform.h"
 #include "widget/gui.h"
 #include "src/core/core.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 
 Friend::Friend(uint32_t FriendId, const ToxId &UserId)
     : userName{Core::getInstance()->getPeerName(UserId)},
diff --git a/src/friendlist.cpp b/src/friendlist.cpp
index 895b858c8..e4d2c0153 100644
--- a/src/friendlist.cpp
+++ b/src/friendlist.cpp
@@ -14,7 +14,7 @@
 
 #include "friend.h"
 #include "friendlist.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include <QMenu>
 #include <QDebug>
 #include <QHash>
diff --git a/src/ipc.cpp b/src/ipc.cpp
index 78f2f0f8a..4947934ef 100644
--- a/src/ipc.cpp
+++ b/src/ipc.cpp
@@ -13,7 +13,7 @@
 */
 
 #include "src/ipc.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include <QDebug>
 #include <QCoreApplication>
 #include <random>
diff --git a/src/widget/loginscreen.ui b/src/loginscreen.ui
similarity index 100%
rename from src/widget/loginscreen.ui
rename to src/loginscreen.ui
diff --git a/src/main.cpp b/src/main.cpp
index 095483c8a..e917c87c6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -13,16 +13,16 @@
 */
 
 #include "widget/widget.h"
-#include "misc/settings.h"
+#include "persistence/settings.h"
 #include "src/nexus.h"
 #include "src/ipc.h"
-#include "src/widget/toxuri.h"
-#include "src/widget/toxsave.h"
-#include "src/autoupdate.h"
-#include "src/profile.h"
-#include "src/profilelocker.h"
+#include "src/net/toxuri.h"
+#include "src/net/autoupdate.h"
+#include "src/persistence/toxsave.h"
+#include "src/persistence/profile.h"
+#include "src/persistence/profilelocker.h"
 #include "src/widget/loginscreen.h"
-#include "src/translator.h"
+#include "src/widget/translator.h"
 #include <QApplication>
 #include <QCommandLineParser>
 #include <QDateTime>
diff --git a/src/autoupdate.cpp b/src/net/autoupdate.cpp
similarity index 99%
rename from src/autoupdate.cpp
rename to src/net/autoupdate.cpp
index 5effb2f23..2cfb64435 100644
--- a/src/autoupdate.cpp
+++ b/src/net/autoupdate.cpp
@@ -13,9 +13,9 @@
 */
 
 
-#include "src/autoupdate.h"
-#include "src/misc/serialize.h"
-#include "src/misc/settings.h"
+#include "src/net/autoupdate.h"
+#include "src/persistence/serialize.h"
+#include "src/persistence/settings.h"
 #include "src/widget/widget.h"
 #include "src/widget/gui.h"
 #include <QNetworkAccessManager>
diff --git a/src/autoupdate.h b/src/net/autoupdate.h
similarity index 100%
rename from src/autoupdate.h
rename to src/net/autoupdate.h
diff --git a/src/avatarbroadcaster.cpp b/src/net/avatarbroadcaster.cpp
similarity index 100%
rename from src/avatarbroadcaster.cpp
rename to src/net/avatarbroadcaster.cpp
diff --git a/src/avatarbroadcaster.h b/src/net/avatarbroadcaster.h
similarity index 100%
rename from src/avatarbroadcaster.h
rename to src/net/avatarbroadcaster.h
diff --git a/src/toxdns.cpp b/src/net/toxdns.cpp
similarity index 99%
rename from src/toxdns.cpp
rename to src/net/toxdns.cpp
index d95e25dee..9c9f23ce0 100644
--- a/src/toxdns.cpp
+++ b/src/net/toxdns.cpp
@@ -13,8 +13,8 @@
 */
 
 
-#include "src/toxdns.h"
-#include "src/misc/cdata.h"
+#include "src/net/toxdns.h"
+#include "src/core/cdata.h"
 #include <QMessageBox>
 #include <QCoreApplication>
 #include <QThread>
diff --git a/src/toxdns.h b/src/net/toxdns.h
similarity index 97%
rename from src/toxdns.h
rename to src/net/toxdns.h
index a6bee8925..b2b66ed0c 100644
--- a/src/toxdns.h
+++ b/src/net/toxdns.h
@@ -16,8 +16,8 @@
 #ifndef QTOXDNS_H
 #define QTOXDNS_H
 
-#include "core/corestructs.h"
-#include "core/toxid.h"
+#include "src/core/corestructs.h"
+#include "src/core/toxid.h"
 #include <QDnsLookup>
 #include <QObject>
 
diff --git a/src/toxme.cpp b/src/net/toxme.cpp
similarity index 100%
rename from src/toxme.cpp
rename to src/net/toxme.cpp
diff --git a/src/toxme.h b/src/net/toxme.h
similarity index 97%
rename from src/toxme.h
rename to src/net/toxme.h
index 7c0d4f718..6ea1ad4dc 100644
--- a/src/toxme.h
+++ b/src/net/toxme.h
@@ -4,7 +4,7 @@
 #include <QString>
 #include <QMutex>
 #include <memory>
-#include "core/toxid.h"
+#include "src/core/toxid.h"
 
 class QNetworkAccessManager;
 
diff --git a/src/widget/toxuri.cpp b/src/net/toxuri.cpp
similarity index 98%
rename from src/widget/toxuri.cpp
rename to src/net/toxuri.cpp
index c49518d2d..4c31cb3b9 100644
--- a/src/widget/toxuri.cpp
+++ b/src/net/toxuri.cpp
@@ -13,8 +13,8 @@
 */
 
 
-#include "src/widget/toxuri.h"
-#include "src/toxdns.h"
+#include "src/net/toxuri.h"
+#include "src/net/toxdns.h"
 #include "src/widget/tool/friendrequestdialog.h"
 #include "src/nexus.h"
 #include "src/core/core.h"
diff --git a/src/widget/toxuri.h b/src/net/toxuri.h
similarity index 100%
rename from src/widget/toxuri.h
rename to src/net/toxuri.h
diff --git a/src/nexus.cpp b/src/nexus.cpp
index 3931a0dc4..8fd399e21 100644
--- a/src/nexus.cpp
+++ b/src/nexus.cpp
@@ -1,7 +1,7 @@
 #include "nexus.h"
-#include "profile.h"
+#include "src/persistence/profile.h"
 #include "src/core/core.h"
-#include "misc/settings.h"
+#include "persistence/settings.h"
 #include "video/camerasource.h"
 #include "widget/gui.h"
 #include "widget/loginscreen.h"
diff --git a/src/misc/db/encrypteddb.cpp b/src/persistence/db/encrypteddb.cpp
similarity index 99%
rename from src/misc/db/encrypteddb.cpp
rename to src/persistence/db/encrypteddb.cpp
index f215225fe..759087a2b 100644
--- a/src/misc/db/encrypteddb.cpp
+++ b/src/persistence/db/encrypteddb.cpp
@@ -13,7 +13,7 @@
 */
 
 #include "encrypteddb.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include "src/core/core.h"
 
 #include <tox/toxencryptsave.h>
diff --git a/src/misc/db/encrypteddb.h b/src/persistence/db/encrypteddb.h
similarity index 100%
rename from src/misc/db/encrypteddb.h
rename to src/persistence/db/encrypteddb.h
diff --git a/src/misc/db/genericddinterface.cpp b/src/persistence/db/genericddinterface.cpp
similarity index 100%
rename from src/misc/db/genericddinterface.cpp
rename to src/persistence/db/genericddinterface.cpp
diff --git a/src/misc/db/genericddinterface.h b/src/persistence/db/genericddinterface.h
similarity index 100%
rename from src/misc/db/genericddinterface.h
rename to src/persistence/db/genericddinterface.h
diff --git a/src/misc/db/plaindb.cpp b/src/persistence/db/plaindb.cpp
similarity index 100%
rename from src/misc/db/plaindb.cpp
rename to src/persistence/db/plaindb.cpp
diff --git a/src/misc/db/plaindb.h b/src/persistence/db/plaindb.h
similarity index 100%
rename from src/misc/db/plaindb.h
rename to src/persistence/db/plaindb.h
diff --git a/src/historykeeper.cpp b/src/persistence/historykeeper.cpp
similarity index 98%
rename from src/historykeeper.cpp
rename to src/persistence/historykeeper.cpp
index f08067219..85ae13a4b 100644
--- a/src/historykeeper.cpp
+++ b/src/persistence/historykeeper.cpp
@@ -13,10 +13,10 @@
 */
 
 #include "historykeeper.h"
-#include "misc/settings.h"
+#include "src/persistence/settings.h"
 #include "src/core/core.h"
 #include "src/nexus.h"
-#include "src/profile.h"
+#include "src/persistence/profile.h"
 
 #include <QSqlError>
 #include <QFile>
@@ -26,8 +26,8 @@
 #include <QDebug>
 #include <QTemporaryFile>
 
-#include "misc/db/plaindb.h"
-#include "misc/db/encrypteddb.h"
+#include "src/persistence/db/plaindb.h"
+#include "src/persistence/db/encrypteddb.h"
 
 static HistoryKeeper *historyInstance = nullptr;
 
diff --git a/src/historykeeper.h b/src/persistence/historykeeper.h
similarity index 100%
rename from src/historykeeper.h
rename to src/persistence/historykeeper.h
diff --git a/src/offlinemsgengine.cpp b/src/persistence/offlinemsgengine.cpp
similarity index 97%
rename from src/offlinemsgengine.cpp
rename to src/persistence/offlinemsgengine.cpp
index a5a279c45..f1b3e4e0b 100644
--- a/src/offlinemsgengine.cpp
+++ b/src/persistence/offlinemsgengine.cpp
@@ -14,8 +14,8 @@
 
 #include "offlinemsgengine.h"
 #include "src/friend.h"
-#include "src/historykeeper.h"
-#include "src/misc/settings.h"
+#include "src/persistence/historykeeper.h"
+#include "src/persistence/settings.h"
 #include "src/core/core.h"
 #include <QMutexLocker>
 #include <QTimer>
diff --git a/src/offlinemsgengine.h b/src/persistence/offlinemsgengine.h
similarity index 100%
rename from src/offlinemsgengine.h
rename to src/persistence/offlinemsgengine.h
diff --git a/src/profile.cpp b/src/persistence/profile.cpp
similarity index 99%
rename from src/profile.cpp
rename to src/persistence/profile.cpp
index 278485047..76d9c26c5 100644
--- a/src/profile.cpp
+++ b/src/persistence/profile.cpp
@@ -1,8 +1,8 @@
 #include "profile.h"
 #include "profilelocker.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include "src/core/core.h"
-#include "src/historykeeper.h"
+#include "src/persistence/historykeeper.h"
 #include "src/widget/gui.h"
 #include "src/widget/widget.h"
 #include "src/nexus.h"
@@ -13,6 +13,7 @@
 #include <QThread>
 #include <QObject>
 #include <QDebug>
+
 QVector<QString> Profile::profiles;
 
 Profile::Profile(QString name, QString password, bool isNewProfile)
diff --git a/src/profile.h b/src/persistence/profile.h
similarity index 100%
rename from src/profile.h
rename to src/persistence/profile.h
diff --git a/src/profilelocker.cpp b/src/persistence/profilelocker.cpp
similarity index 98%
rename from src/profilelocker.cpp
rename to src/persistence/profilelocker.cpp
index 93d18c1d8..c94a20565 100644
--- a/src/profilelocker.cpp
+++ b/src/persistence/profilelocker.cpp
@@ -1,5 +1,5 @@
 #include "profilelocker.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include <QDir>
 #include <QDebug>
 
diff --git a/src/profilelocker.h b/src/persistence/profilelocker.h
similarity index 100%
rename from src/profilelocker.h
rename to src/persistence/profilelocker.h
diff --git a/src/misc/serialize.cpp b/src/persistence/serialize.cpp
similarity index 99%
rename from src/misc/serialize.cpp
rename to src/persistence/serialize.cpp
index 87bb179f8..33025b32f 100644
--- a/src/misc/serialize.cpp
+++ b/src/persistence/serialize.cpp
@@ -13,7 +13,7 @@
 */
 
 
-#include "src/misc/serialize.h"
+#include "src/persistence/serialize.h"
 
 QByteArray doubleToData(double num)
 {
diff --git a/src/misc/serialize.h b/src/persistence/serialize.h
similarity index 100%
rename from src/misc/serialize.h
rename to src/persistence/serialize.h
diff --git a/src/misc/settings.cpp b/src/persistence/settings.cpp
similarity index 99%
rename from src/misc/settings.cpp
rename to src/persistence/settings.cpp
index 648b2151f..73f9aa6c9 100644
--- a/src/misc/settings.cpp
+++ b/src/persistence/settings.cpp
@@ -15,12 +15,12 @@
 */
 
 #include "settings.h"
-#include "smileypack.h"
+#include "src/persistence/smileypack.h"
+#include "src/persistence/db/plaindb.h"
 #include "src/core/corestructs.h"
-#include "src/misc/db/plaindb.h"
 #include "src/core/core.h"
 #include "src/widget/gui.h"
-#include "src/profilelocker.h"
+#include "src/persistence/profilelocker.h"
 #ifdef QTOX_PLATFORM_EXT
 #include "src/platform/autorun.h"
 #endif
diff --git a/src/misc/settings.h b/src/persistence/settings.h
similarity index 100%
rename from src/misc/settings.h
rename to src/persistence/settings.h
diff --git a/src/misc/smileypack.cpp b/src/persistence/smileypack.cpp
similarity index 98%
rename from src/misc/smileypack.cpp
rename to src/persistence/smileypack.cpp
index 46c571224..fea8caac6 100644
--- a/src/misc/smileypack.cpp
+++ b/src/persistence/smileypack.cpp
@@ -13,8 +13,8 @@
 */
 
 #include "smileypack.h"
-#include "settings.h"
-#include "style.h"
+#include "src/persistence/settings.h"
+#include "src/widget/style.h"
 
 #include <QFileInfo>
 #include <QFile>
diff --git a/src/misc/smileypack.h b/src/persistence/smileypack.h
similarity index 100%
rename from src/misc/smileypack.h
rename to src/persistence/smileypack.h
diff --git a/src/widget/toxsave.cpp b/src/persistence/toxsave.cpp
similarity index 97%
rename from src/widget/toxsave.cpp
rename to src/persistence/toxsave.cpp
index 977953912..fd4a4a423 100644
--- a/src/widget/toxsave.cpp
+++ b/src/persistence/toxsave.cpp
@@ -13,9 +13,9 @@
 */
 
 #include "toxsave.h"
-#include "gui.h"
+#include "src/widget/gui.h"
 #include "src/core/core.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include <QCoreApplication>
 #include <QFileInfo>
 
diff --git a/src/widget/toxsave.h b/src/persistence/toxsave.h
similarity index 100%
rename from src/widget/toxsave.h
rename to src/persistence/toxsave.h
diff --git a/src/platform/autorun_win.cpp b/src/platform/autorun_win.cpp
index 9c36176fd..d32e0cf9b 100644
--- a/src/platform/autorun_win.cpp
+++ b/src/platform/autorun_win.cpp
@@ -15,7 +15,7 @@
 #include <QApplication>
 #ifdef Q_OS_WIN32
 #include "src/platform/autorun.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include <windows.h>
 #include <string>
 
diff --git a/src/platform/autorun_xdg.cpp b/src/platform/autorun_xdg.cpp
index b2028b232..f3be84552 100644
--- a/src/platform/autorun_xdg.cpp
+++ b/src/platform/autorun_xdg.cpp
@@ -15,7 +15,7 @@
 #include <QApplication>
 #if defined(Q_OS_UNIX) && !defined(__APPLE__) && !defined(__MACH__)
 #include "src/platform/autorun.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include <QProcessEnvironment>
 #include <QDir>
 
diff --git a/src/video/cameradevice.cpp b/src/video/cameradevice.cpp
index 8067445b5..5e09394e2 100644
--- a/src/video/cameradevice.cpp
+++ b/src/video/cameradevice.cpp
@@ -6,7 +6,7 @@ extern "C" {
 #include <libavdevice/avdevice.h>
 }
 #include "cameradevice.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 
 #ifdef Q_OS_WIN
 #include "src/platform/camera/directshow.h"
diff --git a/src/widget/netcamview.cpp b/src/video/netcamview.cpp
similarity index 97%
rename from src/widget/netcamview.cpp
rename to src/video/netcamview.cpp
index fc5bdf79c..479f5c587 100644
--- a/src/widget/netcamview.cpp
+++ b/src/video/netcamview.cpp
@@ -14,7 +14,7 @@
 
 #include "netcamview.h"
 #include "src/core/core.h"
-#include "src/widget/videosurface.h"
+#include "src/video/videosurface.h"
 #include <QLabel>
 #include <QHBoxLayout>
 
diff --git a/src/widget/netcamview.h b/src/video/netcamview.h
similarity index 100%
rename from src/widget/netcamview.h
rename to src/video/netcamview.h
diff --git a/src/widget/videosurface.cpp b/src/video/videosurface.cpp
similarity index 100%
rename from src/widget/videosurface.cpp
rename to src/video/videosurface.cpp
diff --git a/src/widget/videosurface.h b/src/video/videosurface.h
similarity index 100%
rename from src/widget/videosurface.h
rename to src/video/videosurface.h
diff --git a/src/widget/androidgui.cpp b/src/widget/androidgui.cpp
index aba6de0d4..43223475d 100644
--- a/src/widget/androidgui.cpp
+++ b/src/widget/androidgui.cpp
@@ -7,7 +7,7 @@
 #include "src/friendlist.h"
 #include "src/group.h"
 #include "src/grouplist.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include "src/misc/style.h"
 #include "src/nexus.h"
 #include "src/widget/friendwidget.h"
diff --git a/src/widget/emoticonswidget.cpp b/src/widget/emoticonswidget.cpp
index 9f55198db..df4b5fabf 100644
--- a/src/widget/emoticonswidget.cpp
+++ b/src/widget/emoticonswidget.cpp
@@ -13,9 +13,9 @@
 */
 
 #include "emoticonswidget.h"
-#include "src/misc/smileypack.h"
-#include "src/misc/style.h"
-#include "src/misc/settings.h"
+#include "src/widget/style.h"
+#include "src/persistence/smileypack.h"
+#include "src/persistence/settings.h"
 
 #include <QPushButton>
 #include <QRadioButton>
diff --git a/src/misc/flowlayout.cpp b/src/widget/flowlayout.cpp
similarity index 100%
rename from src/misc/flowlayout.cpp
rename to src/widget/flowlayout.cpp
diff --git a/src/misc/flowlayout.h b/src/widget/flowlayout.h
similarity index 100%
rename from src/misc/flowlayout.h
rename to src/widget/flowlayout.h
diff --git a/src/widget/form/addfriendform.cpp b/src/widget/form/addfriendform.cpp
index 48f35aeba..9f7090fad 100644
--- a/src/widget/form/addfriendform.cpp
+++ b/src/widget/form/addfriendform.cpp
@@ -22,11 +22,11 @@
 #include "ui_mainwindow.h"
 #include "src/nexus.h"
 #include "src/core/core.h"
-#include "src/misc/cdata.h"
-#include "src/toxdns.h"
-#include "src/misc/settings.h"
+#include "src/core/cdata.h"
+#include "src/net/toxdns.h"
+#include "src/persistence/settings.h"
 #include "src/widget/gui.h"
-#include "src/translator.h"
+#include "src/widget/translator.h"
 
 AddFriendForm::AddFriendForm()
 {
diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp
index 194783fb1..6111f16d6 100644
--- a/src/widget/form/chatform.cpp
+++ b/src/widget/form/chatform.cpp
@@ -27,27 +27,27 @@
 #include "chatform.h"
 #include "src/core/core.h"
 #include "src/friend.h"
-#include "src/historykeeper.h"
-#include "src/misc/style.h"
-#include "src/misc/settings.h"
-#include "src/misc/cstring.h"
-#include "src/widget/callconfirmwidget.h"
+#include "src/persistence/historykeeper.h"
+#include "src/widget/style.h"
+#include "src/persistence/settings.h"
+#include "src/core/cstring.h"
+#include "src/widget/tool/callconfirmwidget.h"
 #include "src/widget/friendwidget.h"
-#include "src/widget/netcamview.h"
+#include "src/video/netcamview.h"
 #include "src/widget/form/loadhistorydialog.h"
 #include "src/widget/tool/chattextedit.h"
 #include "src/widget/widget.h"
 #include "src/widget/maskablepixmapwidget.h"
-#include "src/widget/croppinglabel.h"
+#include "src/widget/tool/croppinglabel.h"
 #include "src/chatlog/chatmessage.h"
 #include "src/chatlog/content/filetransferwidget.h"
 #include "src/chatlog/chatlinecontentproxy.h"
 #include "src/chatlog/content/text.h"
 #include "src/chatlog/chatlog.h"
-#include "src/offlinemsgengine.h"
+#include "src/persistence/offlinemsgengine.h"
 #include "src/widget/tool/screenshotgrabber.h"
 #include "src/widget/tool/flyoutoverlaywidget.h"
-#include "src/translator.h"
+#include "src/widget/translator.h"
 
 ChatForm::ChatForm(Friend* chatFriend)
     : f(chatFriend)
diff --git a/src/widget/form/filesform.cpp b/src/widget/form/filesform.cpp
index b0b8866b4..3abde2fce 100644
--- a/src/widget/form/filesform.cpp
+++ b/src/widget/form/filesform.cpp
@@ -15,7 +15,7 @@
 #include "filesform.h"
 #include "ui_mainwindow.h"
 #include "src/widget/widget.h"
-#include "src/translator.h"
+#include "src/widget/translator.h"
 #include <QFileInfo>
 #include <QUrl>
 #include <QDebug>
diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp
index 2a3b7d286..a23acbd8e 100644
--- a/src/widget/form/genericchatform.cpp
+++ b/src/widget/form/genericchatform.cpp
@@ -21,11 +21,11 @@
 #include <QShortcut>
 #include <QKeyEvent>
 
-#include "src/misc/smileypack.h"
+#include "src/persistence/smileypack.h"
 #include "src/widget/emoticonswidget.h"
-#include "src/misc/style.h"
+#include "src/widget/style.h"
 #include "src/widget/widget.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include "src/widget/tool/chattextedit.h"
 #include "src/widget/maskablepixmapwidget.h"
 #include "src/core/core.h"
@@ -36,7 +36,7 @@
 #include "src/chatlog/chatlog.h"
 #include "src/chatlog/content/timestamp.h"
 #include "src/widget/tool/flyoutoverlaywidget.h"
-#include "src/translator.h"
+#include "src/widget/translator.h"
 
 GenericChatForm::GenericChatForm(QWidget *parent)
   : QWidget(parent)
diff --git a/src/widget/form/groupchatform.cpp b/src/widget/form/groupchatform.cpp
index 1786c332d..69d3e448b 100644
--- a/src/widget/form/groupchatform.cpp
+++ b/src/widget/form/groupchatform.cpp
@@ -17,13 +17,13 @@
 #include "src/group.h"
 #include "src/widget/groupwidget.h"
 #include "src/widget/tool/chattextedit.h"
-#include "src/widget/croppinglabel.h"
+#include "src/widget/tool/croppinglabel.h"
 #include "src/widget/maskablepixmapwidget.h"
 #include "src/core/core.h"
-#include "src/misc/style.h"
-#include "src/historykeeper.h"
-#include "src/misc/flowlayout.h"
-#include "src/translator.h"
+#include "src/widget/style.h"
+#include "src/persistence/historykeeper.h"
+#include "src/widget/flowlayout.h"
+#include "src/widget/translator.h"
 #include <QDebug>
 #include <QTimer>
 #include <QPushButton>
diff --git a/src/widget/form/profileform.cpp b/src/widget/form/profileform.cpp
index a146f6a56..c16ab0048 100644
--- a/src/widget/form/profileform.cpp
+++ b/src/widget/form/profileform.cpp
@@ -20,15 +20,15 @@
 #include "src/widget/form/settingswidget.h"
 #include "src/widget/maskablepixmapwidget.h"
 #include "src/widget/form/setpassworddialog.h"
-#include "src/misc/settings.h"
-#include "src/widget/croppinglabel.h"
+#include "src/persistence/settings.h"
+#include "src/widget/tool/croppinglabel.h"
 #include "src/widget/widget.h"
 #include "src/widget/gui.h"
-#include "src/historykeeper.h"
-#include "src/misc/style.h"
-#include "src/profilelocker.h"
-#include "src/profile.h"
-#include "src/translator.h"
+#include "src/widget/style.h"
+#include "src/persistence/historykeeper.h"
+#include "src/persistence/profilelocker.h"
+#include "src/persistence/profile.h"
+#include "src/widget/translator.h"
 #include <QLabel>
 #include <QLineEdit>
 #include <QGroupBox>
diff --git a/src/widget/form/profileform.h b/src/widget/form/profileform.h
index b778960a4..57bdc11f0 100644
--- a/src/widget/form/profileform.h
+++ b/src/widget/form/profileform.h
@@ -20,7 +20,7 @@
 #include <QTimer>
 #include <QVBoxLayout>
 #include "src/core/core.h"
-#include "src/misc/qrwidget.h"
+#include "src/widget/qrwidget.h"
 
 class CroppingLabel;
 class Core;
diff --git a/src/widget/form/profileform.ui b/src/widget/form/profileform.ui
index 239f76f3b..c89c17eff 100644
--- a/src/widget/form/profileform.ui
+++ b/src/widget/form/profileform.ui
@@ -39,7 +39,7 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>579</width>
+        <width>585</width>
         <height>625</height>
        </rect>
       </property>
@@ -283,7 +283,7 @@ Profile does not contain your history.</string>
   <customwidget>
    <class>CroppingLabel</class>
    <extends>QLabel</extends>
-   <header location="global">src/widget/croppinglabel.h</header>
+   <header location="global">src/widget/tool/croppinglabel.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/widget/form/settings/advancedform.cpp b/src/widget/form/settings/advancedform.cpp
index 525b37393..74e7abb7e 100644
--- a/src/widget/form/settings/advancedform.cpp
+++ b/src/widget/form/settings/advancedform.cpp
@@ -15,10 +15,10 @@
 #include "ui_advancedsettings.h"
 
 #include "advancedform.h"
-#include "src/historykeeper.h"
-#include "src/misc/settings.h"
-#include "src/misc/db/plaindb.h"
-#include "src/translator.h"
+#include "src/persistence/historykeeper.h"
+#include "src/persistence/settings.h"
+#include "src/persistence/db/plaindb.h"
+#include "src/widget/translator.h"
 
 AdvancedForm::AdvancedForm() :
     GenericForm(QPixmap(":/img/settings/general.png"))
diff --git a/src/widget/form/settings/avform.cpp b/src/widget/form/settings/avform.cpp
index 74dbf9d24..09de08560 100644
--- a/src/widget/form/settings/avform.cpp
+++ b/src/widget/form/settings/avform.cpp
@@ -14,12 +14,12 @@
 
 #include "avform.h"
 #include "ui_avsettings.h"
-#include "src/misc/settings.h"
-#include "src/audio.h"
+#include "src/persistence/settings.h"
+#include "src/audio/audio.h"
 #include "src/video/camerasource.h"
 #include "src/video/cameradevice.h"
-#include "src/widget/videosurface.h"
-#include "src/translator.h"
+#include "src/video/videosurface.h"
+#include "src/widget/translator.h"
 
 #if defined(__APPLE__) && defined(__MACH__)
  #include <OpenAL/al.h>
diff --git a/src/widget/form/settings/generalform.cpp b/src/widget/form/settings/generalform.cpp
index 7e9b9e8fa..be6d5e55e 100644
--- a/src/widget/form/settings/generalform.cpp
+++ b/src/widget/form/settings/generalform.cpp
@@ -16,13 +16,14 @@
 #include "generalform.h"
 #include "src/widget/form/settingswidget.h"
 #include "src/widget/widget.h"
-#include "src/misc/settings.h"
-#include "src/misc/smileypack.h"
+#include "src/persistence/settings.h"
+#include "src/persistence/smileypack.h"
 #include "src/core/core.h"
-#include "src/misc/style.h"
+#include "src/widget/style.h"
 #include "src/nexus.h"
-#include "src/profile.h"
-#include "src/translator.h"
+#include "src/persistence/profile.h"
+#include "src/widget/translator.h"
+#include "src/net/autoupdate.h"
 #include <QMessageBox>
 #include <QStyleFactory>
 #include <QTime>
@@ -30,8 +31,6 @@
 #include <QStandardPaths>
 #include <QDebug>
 
-#include "src/autoupdate.h"
-
 static QStringList locales = {"bg", "de", "en", "es", "fr", "hr", "hu", "it", "lt", "mannol", "nl", "no_nb", "pirate", "pl", "pt", "ru", "sl", "fi", "sv", "uk", "zh"};
 static QStringList langs = {"Български", "Deutsch", "English", "Español", "Français", "Hrvatski", "Magyar", "Italiano", "Lietuvių", "mannol", "Nederlands", "Norsk Bokmål", "Pirate", "Polski", "Português", "Русский", "Slovenščina", "Suomi", "Svenska", "Українська", "简体中文"};
 
diff --git a/src/widget/form/settings/privacyform.cpp b/src/widget/form/settings/privacyform.cpp
index ff6345eba..bb56f880d 100644
--- a/src/widget/form/settings/privacyform.cpp
+++ b/src/widget/form/settings/privacyform.cpp
@@ -15,13 +15,13 @@
 #include "privacyform.h"
 #include "ui_privacysettings.h"
 #include "src/widget/form/settingswidget.h"
-#include "src/misc/settings.h"
-#include "src/historykeeper.h"
+#include "src/persistence/settings.h"
+#include "src/persistence/historykeeper.h"
 #include "src/core/core.h"
 #include "src/widget/widget.h"
 #include "src/widget/gui.h"
 #include "src/widget/form/setpassworddialog.h"
-#include "src/translator.h"
+#include "src/widget/translator.h"
 #include <QMessageBox>
 #include <QFile>
 #include <QDebug>
diff --git a/src/widget/form/settingswidget.cpp b/src/widget/form/settingswidget.cpp
index b6fdad079..ff3630286 100644
--- a/src/widget/form/settingswidget.cpp
+++ b/src/widget/form/settingswidget.cpp
@@ -20,7 +20,7 @@
 #include "src/widget/form/settings/privacyform.h"
 #include "src/widget/form/settings/avform.h"
 #include "src/widget/form/settings/advancedform.h"
-#include "src/translator.h"
+#include "src/widget/translator.h"
 #include <QTabWidget>
 
 SettingsWidget::SettingsWidget(QWidget* parent)
diff --git a/src/widget/friendwidget.cpp b/src/widget/friendwidget.cpp
index 427189235..0699939d0 100644
--- a/src/widget/friendwidget.cpp
+++ b/src/widget/friendwidget.cpp
@@ -21,9 +21,9 @@
 #include "src/core/core.h"
 #include "form/chatform.h"
 #include "maskablepixmapwidget.h"
-#include "croppinglabel.h"
-#include "src/misc/style.h"
-#include "src/misc/settings.h"
+#include "src/widget/tool/croppinglabel.h"
+#include "src/widget/style.h"
+#include "src/persistence/settings.h"
 #include "src/widget/widget.h"
 #include <QContextMenuEvent>
 #include <QMenu>
diff --git a/src/widget/genericchatroomwidget.cpp b/src/widget/genericchatroomwidget.cpp
index 850199970..16c527e04 100644
--- a/src/widget/genericchatroomwidget.cpp
+++ b/src/widget/genericchatroomwidget.cpp
@@ -13,10 +13,10 @@
 */
 
 #include "genericchatroomwidget.h"
-#include "src/misc/style.h"
-#include "src/misc/settings.h"
+#include "src/widget/style.h"
+#include "src/persistence/settings.h"
 #include "maskablepixmapwidget.h"
-#include "croppinglabel.h"
+#include "src/widget/tool/croppinglabel.h"
 #include <QMouseEvent>
 #include <QStyle>
 
diff --git a/src/widget/groupwidget.cpp b/src/widget/groupwidget.cpp
index 905f591c5..bae9a9744 100644
--- a/src/widget/groupwidget.cpp
+++ b/src/widget/groupwidget.cpp
@@ -15,10 +15,10 @@
 #include "groupwidget.h"
 #include "src/grouplist.h"
 #include "src/group.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include "form/groupchatform.h"
 #include "maskablepixmapwidget.h"
-#include "src/misc/style.h"
+#include "src/widget/style.h"
 #include "src/core/core.h"
 #include <QPalette>
 #include <QMenu>
diff --git a/src/widget/loginscreen.cpp b/src/widget/loginscreen.cpp
index 047ad1b72..9e53f5865 100644
--- a/src/widget/loginscreen.cpp
+++ b/src/widget/loginscreen.cpp
@@ -1,11 +1,11 @@
 #include "loginscreen.h"
 #include "ui_loginscreen.h"
-#include "src/profile.h"
-#include "src/profilelocker.h"
+#include "src/persistence/profile.h"
+#include "src/persistence/profilelocker.h"
 #include "src/nexus.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include "src/widget/form/setpassworddialog.h"
-#include "src/translator.h"
+#include "src/widget/translator.h"
 #include <QMessageBox>
 #include <QDebug>
 
diff --git a/src/misc/qrwidget.cpp b/src/widget/qrwidget.cpp
similarity index 100%
rename from src/misc/qrwidget.cpp
rename to src/widget/qrwidget.cpp
diff --git a/src/misc/qrwidget.h b/src/widget/qrwidget.h
similarity index 100%
rename from src/misc/qrwidget.h
rename to src/widget/qrwidget.h
diff --git a/src/misc/style.cpp b/src/widget/style.cpp
similarity index 99%
rename from src/misc/style.cpp
rename to src/widget/style.cpp
index d93e0e908..18fa99bc8 100644
--- a/src/misc/style.cpp
+++ b/src/widget/style.cpp
@@ -13,7 +13,7 @@
 */
 
 #include "style.h"
-#include "settings.h"
+#include "src/persistence/settings.h"
 #include "src/widget/gui.h"
 
 #include <QFile>
diff --git a/src/misc/style.h b/src/widget/style.h
similarity index 100%
rename from src/misc/style.h
rename to src/widget/style.h
diff --git a/src/widget/systemtrayicon.cpp b/src/widget/systemtrayicon.cpp
index cfa6b472f..3e6ce853b 100644
--- a/src/widget/systemtrayicon.cpp
+++ b/src/widget/systemtrayicon.cpp
@@ -4,7 +4,7 @@
 #include <QMenu>
 #include <QFile>
 #include <QDebug>
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 
 SystemTrayIcon::SystemTrayIcon()
 {
diff --git a/src/widget/callconfirmwidget.cpp b/src/widget/tool/callconfirmwidget.cpp
similarity index 99%
rename from src/widget/callconfirmwidget.cpp
rename to src/widget/tool/callconfirmwidget.cpp
index 73d312f35..606d4f643 100644
--- a/src/widget/callconfirmwidget.cpp
+++ b/src/widget/tool/callconfirmwidget.cpp
@@ -1,5 +1,5 @@
 #include "callconfirmwidget.h"
-#include "gui.h"
+#include "src/widget/gui.h"
 #include <assert.h>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
diff --git a/src/widget/callconfirmwidget.h b/src/widget/tool/callconfirmwidget.h
similarity index 100%
rename from src/widget/callconfirmwidget.h
rename to src/widget/tool/callconfirmwidget.h
diff --git a/src/widget/tool/chattextedit.cpp b/src/widget/tool/chattextedit.cpp
index a1a2a757a..f6ac4c727 100644
--- a/src/widget/tool/chattextedit.cpp
+++ b/src/widget/tool/chattextedit.cpp
@@ -13,7 +13,7 @@
 */
 
 #include "chattextedit.h"
-#include "src/translator.h"
+#include "src/widget/translator.h"
 #include <QKeyEvent>
 
 ChatTextEdit::ChatTextEdit(QWidget *parent) :
diff --git a/src/widget/croppinglabel.cpp b/src/widget/tool/croppinglabel.cpp
similarity index 100%
rename from src/widget/croppinglabel.cpp
rename to src/widget/tool/croppinglabel.cpp
diff --git a/src/widget/croppinglabel.h b/src/widget/tool/croppinglabel.h
similarity index 100%
rename from src/widget/croppinglabel.h
rename to src/widget/tool/croppinglabel.h
diff --git a/src/translator.cpp b/src/widget/translator.cpp
similarity index 98%
rename from src/translator.cpp
rename to src/widget/translator.cpp
index 29b0c259a..e3df43a49 100644
--- a/src/translator.cpp
+++ b/src/widget/translator.cpp
@@ -1,5 +1,5 @@
 #include "translator.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include <QApplication>
 #include <QString>
 #include <QLocale>
diff --git a/src/translator.h b/src/widget/translator.h
similarity index 100%
rename from src/translator.h
rename to src/widget/translator.h
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index 537211c54..ef061a438 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -15,7 +15,7 @@
 #include "widget.h"
 #include "ui_mainwindow.h"
 #include "src/core/core.h"
-#include "src/misc/settings.h"
+#include "src/persistence/settings.h"
 #include "src/friend.h"
 #include "src/friendlist.h"
 #include "tool/friendrequestdialog.h"
@@ -24,19 +24,19 @@
 #include "src/group.h"
 #include "groupwidget.h"
 #include "form/groupchatform.h"
-#include "src/misc/style.h"
+#include "src/widget/style.h"
 #include "friendlistwidget.h"
 #include "form/chatform.h"
 #include "maskablepixmapwidget.h"
-#include "src/historykeeper.h"
-#include "src/autoupdate.h"
-#include "src/audio.h"
+#include "src/persistence/historykeeper.h"
+#include "src/net/autoupdate.h"
+#include "src/audio/audio.h"
 #include "src/platform/timer.h"
 #include "systemtrayicon.h"
 #include "src/nexus.h"
 #include "src/widget/gui.h"
-#include "src/offlinemsgengine.h"
-#include "src/translator.h"
+#include "src/persistence/offlinemsgengine.h"
+#include "src/widget/translator.h"
 #include <cassert>
 #include <QMessageBox>
 #include <QDebug>