diff --git a/ccc-app-manager.pro b/ccc-app-manager.pro
index 9d9fdd9fe7dd12daa283cdbd27a952f31c9e518e..573f5693d3a80a1adcf6ea9665c1f2e37041ac27 100644
--- a/ccc-app-manager.pro
+++ b/ccc-app-manager.pro
@@ -25,23 +25,23 @@ DEFINES += QT_DEPRECATED_WARNINGS
 CONFIG += c++11 link_pkgconfig
 
 SOURCES += \
-        main.cpp \
-        mainwindow.cpp \
-    appmanagerjob.cpp \
-    appmanagerwidget.cpp \
-    appmanagercommon.cpp \
-    pkgdownloaddlg.cpp \
-    appmanagermodel.cpp \
-    pkgmonitor.cpp
+        src/main.cpp \
+        src/mainwindow.cpp \
+    src/appmanagerwidget.cpp \
+    src/appmanagermodel.cpp \
+    src/job/appmanagerjob.cpp \
+    src/common/appmanagercommon.cpp \
+    src/dlg/pkgdownloaddlg.cpp \
+    src/pkgmonitor/pkgmonitor.cpp
 
 HEADERS += \
-        mainwindow.h \
-    appmanagerjob.h \
-    appmanagerwidget.h \
-    appmanagercommon.h \
-    pkgdownloaddlg.h \
-    appmanagermodel.h \
-    pkgmonitor.h
+        src/mainwindow.h \
+    src/appmanagerwidget.h \
+    src/appmanagermodel.h \
+    src/job/appmanagerjob.h \
+    src/common/appmanagercommon.h \
+    src/dlg/pkgdownloaddlg.h \
+    src/pkgmonitor/pkgmonitor.h
 
 # Default rules for deployment.
 target.path = /opt/apps/com.github.ccc-app-manager/files
diff --git a/appmanagermodel.cpp b/src/appmanagermodel.cpp
similarity index 100%
rename from appmanagermodel.cpp
rename to src/appmanagermodel.cpp
diff --git a/appmanagermodel.h b/src/appmanagermodel.h
similarity index 97%
rename from appmanagermodel.h
rename to src/appmanagermodel.h
index d2e0552d33d8e3c4215ce16ab3f3e6b14911aa42..1eddb17683539860687a781c6966fa97323b0cc3 100644
--- a/appmanagermodel.h
+++ b/src/appmanagermodel.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "appmanagercommon.h"
-#include "appmanagerjob.h"
+#include "common/appmanagercommon.h"
+#include "job/appmanagerjob.h"
 
 #include <QObject>
 #include <QMap>
diff --git a/appmanagerwidget.cpp b/src/appmanagerwidget.cpp
similarity index 99%
rename from appmanagerwidget.cpp
rename to src/appmanagerwidget.cpp
index 02edbbeb5d6b50113978eaf21703f16e49b8ca25..936f462752f93b71fe9f62f0fa99380fd5c1b030 100644
--- a/appmanagerwidget.cpp
+++ b/src/appmanagerwidget.cpp
@@ -1,5 +1,5 @@
 #include "appmanagerwidget.h"
-#include "pkgdownloaddlg.h"
+#include "dlg/pkgdownloaddlg.h"
 
 #include <DTitlebar>
 #include <DListView>
diff --git a/appmanagerwidget.h b/src/appmanagerwidget.h
similarity index 98%
rename from appmanagerwidget.h
rename to src/appmanagerwidget.h
index 4add3856eaef0307bcdd7f8ecbfe14d02484cefe..f1aef09beb96ac65ce70c44ea4885a88bbabdd74 100644
--- a/appmanagerwidget.h
+++ b/src/appmanagerwidget.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "appmanagercommon.h"
+#include "common/appmanagercommon.h"
 #include "appmanagermodel.h"
 
 #include <DFrame>
diff --git a/appmanagercommon.cpp b/src/common/appmanagercommon.cpp
similarity index 100%
rename from appmanagercommon.cpp
rename to src/common/appmanagercommon.cpp
diff --git a/appmanagercommon.h b/src/common/appmanagercommon.h
similarity index 100%
rename from appmanagercommon.h
rename to src/common/appmanagercommon.h
diff --git a/pkgdownloaddlg.cpp b/src/dlg/pkgdownloaddlg.cpp
similarity index 99%
rename from pkgdownloaddlg.cpp
rename to src/dlg/pkgdownloaddlg.cpp
index 4e3e1b6f66448c21177aaff3a0eed9a90355598e..7fd4188cf0ebde1a84e4505657323ab9b483fcaa 100644
--- a/pkgdownloaddlg.cpp
+++ b/src/dlg/pkgdownloaddlg.cpp
@@ -1,5 +1,5 @@
 #include "pkgdownloaddlg.h"
-#include "appmanagermodel.h"
+#include "../appmanagermodel.h"
 
 #include <DTitlebar>
 #include <DBlurEffectWidget>
diff --git a/pkgdownloaddlg.h b/src/dlg/pkgdownloaddlg.h
similarity index 97%
rename from pkgdownloaddlg.h
rename to src/dlg/pkgdownloaddlg.h
index b6192d5c5758f96651c8bc2406cb4c17ebfa449a..1c7291682dfee0c4f4c18a2ba670237f71dec8c2 100644
--- a/pkgdownloaddlg.h
+++ b/src/dlg/pkgdownloaddlg.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "appmanagercommon.h"
+#include "../common/appmanagercommon.h"
 
 #include <DFrame>
 
diff --git a/appmanagerjob.cpp b/src/job/appmanagerjob.cpp
similarity index 100%
rename from appmanagerjob.cpp
rename to src/job/appmanagerjob.cpp
diff --git a/appmanagerjob.h b/src/job/appmanagerjob.h
similarity index 98%
rename from appmanagerjob.h
rename to src/job/appmanagerjob.h
index 9ec949f506a53c04c60536506a5e9df43a81a8ea..3c38e3af036a7d2938f895640461cdb7e1b3c5bc 100644
--- a/appmanagerjob.h
+++ b/src/job/appmanagerjob.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "appmanagercommon.h"
-#include "pkgmonitor.h"
+#include "../common/appmanagercommon.h"
+#include "../pkgmonitor/pkgmonitor.h"
 
 #include <QObject>
 #include <QMap>
diff --git a/main.cpp b/src/main.cpp
similarity index 100%
rename from main.cpp
rename to src/main.cpp
diff --git a/mainwindow.cpp b/src/mainwindow.cpp
similarity index 100%
rename from mainwindow.cpp
rename to src/mainwindow.cpp
diff --git a/mainwindow.h b/src/mainwindow.h
similarity index 100%
rename from mainwindow.h
rename to src/mainwindow.h
diff --git a/pkgmonitor.cpp b/src/pkgmonitor/pkgmonitor.cpp
similarity index 100%
rename from pkgmonitor.cpp
rename to src/pkgmonitor/pkgmonitor.cpp
diff --git a/pkgmonitor.h b/src/pkgmonitor/pkgmonitor.h
similarity index 100%
rename from pkgmonitor.h
rename to src/pkgmonitor/pkgmonitor.h