diff --git a/src/UserOperationLogForm.cpp b/src/UserOperationLogForm.cpp
index 757b67c..d18f7c4 100644
--- a/src/UserOperationLogForm.cpp
+++ b/src/UserOperationLogForm.cpp
@@ -13,8 +13,8 @@
 #include <QTableView>
 #include "components/SlideableTableView.h"
 #include <QPushButton>
-#include "SelectDialog.h"
-#include "mainwindow.h"
+#include "src/dialogs/SelectDialog.h"
+#include "src/windows/mainwindow.h"
 #include "event/EventCenter.h"
 QString fileNameToDate(QString fileName)
 {
diff --git a/src/AccountFormDialog.cpp b/src/dialogs/AccountFormDialog.cpp
similarity index 100%
rename from src/AccountFormDialog.cpp
rename to src/dialogs/AccountFormDialog.cpp
diff --git a/src/AccountFormDialog.h b/src/dialogs/AccountFormDialog.h
similarity index 100%
rename from src/AccountFormDialog.h
rename to src/dialogs/AccountFormDialog.h
diff --git a/src/AlertDialog.cpp b/src/dialogs/AlertDialog.cpp
similarity index 100%
rename from src/AlertDialog.cpp
rename to src/dialogs/AlertDialog.cpp
diff --git a/src/AlertDialog.h b/src/dialogs/AlertDialog.h
similarity index 100%
rename from src/AlertDialog.h
rename to src/dialogs/AlertDialog.h
diff --git a/src/ChangePasswordFormDialog.cpp b/src/dialogs/ChangePasswordFormDialog.cpp
similarity index 100%
rename from src/ChangePasswordFormDialog.cpp
rename to src/dialogs/ChangePasswordFormDialog.cpp
diff --git a/src/ChangePasswordFormDialog.h b/src/dialogs/ChangePasswordFormDialog.h
similarity index 100%
rename from src/ChangePasswordFormDialog.h
rename to src/dialogs/ChangePasswordFormDialog.h
diff --git a/src/GUIFormBaseDialog.cpp b/src/dialogs/GUIFormBaseDialog.cpp
similarity index 100%
rename from src/GUIFormBaseDialog.cpp
rename to src/dialogs/GUIFormBaseDialog.cpp
diff --git a/src/GUIFormBaseDialog.h b/src/dialogs/GUIFormBaseDialog.h
similarity index 100%
rename from src/GUIFormBaseDialog.h
rename to src/dialogs/GUIFormBaseDialog.h
diff --git a/src/SelectDialog.cpp b/src/dialogs/SelectDialog.cpp
similarity index 100%
rename from src/SelectDialog.cpp
rename to src/dialogs/SelectDialog.cpp
diff --git a/src/SelectDialog.h b/src/dialogs/SelectDialog.h
similarity index 100%
rename from src/SelectDialog.h
rename to src/dialogs/SelectDialog.h
diff --git a/src/guimessagedialog.cpp b/src/dialogs/guimessagedialog.cpp
similarity index 100%
rename from src/guimessagedialog.cpp
rename to src/dialogs/guimessagedialog.cpp
diff --git a/src/guimessagedialog.h b/src/dialogs/guimessagedialog.h
similarity index 100%
rename from src/guimessagedialog.h
rename to src/dialogs/guimessagedialog.h
diff --git a/src/guimessagedialog.ui b/src/dialogs/guimessagedialog.ui
similarity index 100%
rename from src/guimessagedialog.ui
rename to src/dialogs/guimessagedialog.ui
diff --git a/src/TopBarWidget.cpp b/src/forms/TopBarWidget.cpp
similarity index 100%
rename from src/TopBarWidget.cpp
rename to src/forms/TopBarWidget.cpp
diff --git a/src/TopBarWidget.h b/src/forms/TopBarWidget.h
similarity index 100%
rename from src/TopBarWidget.h
rename to src/forms/TopBarWidget.h
diff --git a/src/ScanFormWidget.cpp b/src/forms/scan/ScanFormWidget.cpp
similarity index 99%
rename from src/ScanFormWidget.cpp
rename to src/forms/scan/ScanFormWidget.cpp
index 583c189..76b5a60 100644
--- a/src/ScanFormWidget.cpp
+++ b/src/forms/scan/ScanFormWidget.cpp
@@ -8,7 +8,7 @@
 #include <QToolButton>
 #include "ui_tabformwidget.h"
 #include "guimacros.h"
-#include "patientinformationform.h"
+#include "src/forms/scan/patientinformationform.h"
 #include <QButtonGroup>
 #include "event/EventCenter.h"
 #include <QImage>
diff --git a/src/ScanFormWidget.h b/src/forms/scan/ScanFormWidget.h
similarity index 94%
rename from src/ScanFormWidget.h
rename to src/forms/scan/ScanFormWidget.h
index 9984930..4c54ff2 100644
--- a/src/ScanFormWidget.h
+++ b/src/forms/scan/ScanFormWidget.h
@@ -5,7 +5,7 @@
 #ifndef GUI_SCANFORMWIDGET_H
 #define GUI_SCANFORMWIDGET_H
 
-#include "tabformwidget.h"
+#include "src/forms/tabformwidget.h"
 #include <functional>
 class PatientInformationForm;
 class ScanFormWidget :public TabFormWidget {
diff --git a/src/patientinformationform.cpp b/src/forms/scan/patientinformationform.cpp
similarity index 100%
rename from src/patientinformationform.cpp
rename to src/forms/scan/patientinformationform.cpp
diff --git a/src/patientinformationform.h b/src/forms/scan/patientinformationform.h
similarity index 93%
rename from src/patientinformationform.h
rename to src/forms/scan/patientinformationform.h
index b07a0a0..02cc2f9 100644
--- a/src/patientinformationform.h
+++ b/src/forms/scan/patientinformationform.h
@@ -2,7 +2,7 @@
 #define PATIENTINFORMATIONFORM_H
 
 #include <QWidget>
-#include "editpatientform.h"
+#include "src/forms/select/editpatientform.h"
 namespace Ui {
 class PatientInformationForm;
 }
diff --git a/src/patientinformationform.ui b/src/forms/scan/patientinformationform.ui
similarity index 100%
rename from src/patientinformationform.ui
rename to src/forms/scan/patientinformationform.ui
diff --git a/src/SelectFormWidget.cpp b/src/forms/select/SelectFormWidget.cpp
similarity index 99%
rename from src/SelectFormWidget.cpp
rename to src/forms/select/SelectFormWidget.cpp
index 5437a34..3bf3e95 100644
--- a/src/SelectFormWidget.cpp
+++ b/src/forms/select/SelectFormWidget.cpp
@@ -14,7 +14,7 @@
 #include "editpatientform.h"
 #include "guimacros.h"
 #include "event/EventCenter.h"
-#include "AccountFormDialog.h"
+#include "src/dialogs/AccountFormDialog.h"
 #include <QDebug>
 #include "log/UserOperationLog.h"
 #include <QSortFilterProxyModel>
diff --git a/src/SelectFormWidget.h b/src/forms/select/SelectFormWidget.h
similarity index 100%
rename from src/SelectFormWidget.h
rename to src/forms/select/SelectFormWidget.h
diff --git a/src/editpatientform.cpp b/src/forms/select/editpatientform.cpp
similarity index 100%
rename from src/editpatientform.cpp
rename to src/forms/select/editpatientform.cpp
diff --git a/src/editpatientform.h b/src/forms/select/editpatientform.h
similarity index 100%
rename from src/editpatientform.h
rename to src/forms/select/editpatientform.h
diff --git a/src/editpatientform.ui b/src/forms/select/editpatientform.ui
similarity index 100%
rename from src/editpatientform.ui
rename to src/forms/select/editpatientform.ui
diff --git a/src/AccountTableForm.cpp b/src/forms/settings/AccountTableForm.cpp
similarity index 98%
rename from src/AccountTableForm.cpp
rename to src/forms/settings/AccountTableForm.cpp
index 97be5f1..7e66530 100644
--- a/src/AccountTableForm.cpp
+++ b/src/forms/settings/AccountTableForm.cpp
@@ -9,12 +9,12 @@
 #include <QHeaderView>
 #include "components/AccountRoleComboDelegate.h"
 #include "guimacros.h"
-#include "AlertDialog.h"
+#include "src/dialogs/AlertDialog.h"
 #include "db/SQLHelper.h"
 #include "models/User.h"
 #include <QSqlRecord>
 #include "components/SlideableTableView.h"
-#include "AccountFormDialog.h"
+#include "src/dialogs/AccountFormDialog.h"
 #include "event/EventCenter.h"
 AccountTableForm::AccountTableForm(QWidget* parent) {
 	layout = new QVBoxLayout(this);
diff --git a/src/AccountTableForm.h b/src/forms/settings/AccountTableForm.h
similarity index 100%
rename from src/AccountTableForm.h
rename to src/forms/settings/AccountTableForm.h
diff --git a/src/AdminSettingForm.cpp b/src/forms/settings/AdminSettingForm.cpp
similarity index 98%
rename from src/AdminSettingForm.cpp
rename to src/forms/settings/AdminSettingForm.cpp
index 65ea243..8b6ae3e 100644
--- a/src/AdminSettingForm.cpp
+++ b/src/forms/settings/AdminSettingForm.cpp
@@ -7,7 +7,7 @@
 #include <QStackedWidget>
 #include <QStringListModel>
 #include <QListWidget>
-#include "tabformwidget.h"
+#include "src/forms/tabformwidget.h"
 #include <QListWidgetItem>
 #include "ui_tabformwidget.h"
 #include <QLabel>
diff --git a/src/AdminSettingForm.h b/src/forms/settings/AdminSettingForm.h
similarity index 89%
rename from src/AdminSettingForm.h
rename to src/forms/settings/AdminSettingForm.h
index ccca0b0..c5962d9 100644
--- a/src/AdminSettingForm.h
+++ b/src/forms/settings/AdminSettingForm.h
@@ -5,7 +5,7 @@
 #ifndef GUI_ADMINSETTINGFORM_H
 #define GUI_ADMINSETTINGFORM_H
 
-#include "tabformwidget.h"
+#include "src/forms/tabformwidget.h"
 
 class AdminSettingForm:public TabFormWidget {
     Q_OBJECT
diff --git a/src/aboutwidget.cpp b/src/forms/settings/aboutwidget.cpp
similarity index 100%
rename from src/aboutwidget.cpp
rename to src/forms/settings/aboutwidget.cpp
diff --git a/src/aboutwidget.h b/src/forms/settings/aboutwidget.h
similarity index 100%
rename from src/aboutwidget.h
rename to src/forms/settings/aboutwidget.h
diff --git a/src/generalform.cpp b/src/forms/settings/generalform.cpp
similarity index 96%
rename from src/generalform.cpp
rename to src/forms/settings/generalform.cpp
index a83973a..4c756e7 100644
--- a/src/generalform.cpp
+++ b/src/forms/settings/generalform.cpp
@@ -10,10 +10,10 @@
 #include <QEvent>
 #include "event/EventCenter.h"
 #include "json/jsonobject.h"
-#include "SelectDialog.h"
+#include "src/dialogs/SelectDialog.h"
 
-#include "locker.h"
-#include "languageswitcher.h"
+#include "src/utilities/locker.h"
+#include "src/utilities/languageswitcher.h"
 
 GeneralForm::GeneralForm(QWidget* parent) : QWidget(parent)
 {
diff --git a/src/generalform.h b/src/forms/settings/generalform.h
similarity index 100%
rename from src/generalform.h
rename to src/forms/settings/generalform.h
diff --git a/src/systemsettingform.cpp b/src/forms/settings/systemsettingform.cpp
similarity index 99%
rename from src/systemsettingform.cpp
rename to src/forms/settings/systemsettingform.cpp
index be77bc1..25bcf94 100644
--- a/src/systemsettingform.cpp
+++ b/src/forms/settings/systemsettingform.cpp
@@ -10,7 +10,7 @@
 #include <QEvent>
 #include <QToolButton>
 
-#include "SelectDialog.h"
+#include "src/dialogs/SelectDialog.h"
 #include "components/imageswitch.h"
 #include "network/networkcfgdialog.h"
 #include "network/dicomcfgdialog.h"
diff --git a/src/systemsettingform.h b/src/forms/settings/systemsettingform.h
similarity index 100%
rename from src/systemsettingform.h
rename to src/forms/settings/systemsettingform.h
diff --git a/src/systemsettingform.ui b/src/forms/settings/systemsettingform.ui
similarity index 100%
rename from src/systemsettingform.ui
rename to src/forms/settings/systemsettingform.ui
diff --git a/src/tabformwidget.cpp b/src/forms/tabformwidget.cpp
similarity index 100%
rename from src/tabformwidget.cpp
rename to src/forms/tabformwidget.cpp
diff --git a/src/tabformwidget.h b/src/forms/tabformwidget.h
similarity index 100%
rename from src/tabformwidget.h
rename to src/forms/tabformwidget.h
diff --git a/src/tabformwidget.ui b/src/forms/tabformwidget.ui
similarity index 100%
rename from src/tabformwidget.ui
rename to src/forms/tabformwidget.ui
diff --git a/src/main.cpp b/src/main.cpp
index aa3699a..8a96556 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,7 @@
-#include "mainwindow.h"
+#include "src/windows/mainwindow.h"
 #include <QApplication>
-#include "loginwindow.h"
-#include "InputObject.h"
+#include "src/windows/loginwindow.h"
+#include "src/utilities/InputObject.h"
 #include <QQmlApplicationEngine>
 #include "db/SQLHelper.h"
 #include <QTextCodec>
@@ -13,8 +13,8 @@
 #include <QTranslator>
 #include <src/device/DeviceManager.h>
 #include "json/jsonobject.h"
-#include "locker.h"
-#include "languageswitcher.h"
+#include "src/utilities/locker.h"
+#include "src/utilities/languageswitcher.h"
 QString loadFontFromFile(QString path)
 {
 	static QString font;
diff --git a/src/dicomcfgdialog.ui b/src/network/dicomcfgdialog.ui
similarity index 100%
rename from src/dicomcfgdialog.ui
rename to src/network/dicomcfgdialog.ui
diff --git a/src/network/getadminpsw.h b/src/network/getadminpsw.h
index 362155f..c710011 100644
--- a/src/network/getadminpsw.h
+++ b/src/network/getadminpsw.h
@@ -5,7 +5,7 @@
 #ifndef GUI_GETADMINPSW_H
 #define GUI_GETADMINPSW_H
 
-#include "GUIFormBaseDialog.h"
+#include "src/dialogs/GUIFormBaseDialog.h"
 class QLineEdit;
 class QLabel;
 class GetAdminPsw :public  GUIFormBaseDialog {
diff --git a/src/network/getipdialog.h b/src/network/getipdialog.h
index 0c1bb9c..f123a7d 100644
--- a/src/network/getipdialog.h
+++ b/src/network/getipdialog.h
@@ -5,7 +5,7 @@
 #ifndef GUI_GETIPDIALOG_H
 #define GUI_GETIPDIALOG_H
 
-#include "GUIFormBaseDialog.h"
+#include "src/dialogs/GUIFormBaseDialog.h"
 class QLineEdit;
 class QLabel;
 class GetIPDialog :public  GUIFormBaseDialog {
diff --git a/src/network/getroutedialog.h b/src/network/getroutedialog.h
index 62eae97..03336c0 100644
--- a/src/network/getroutedialog.h
+++ b/src/network/getroutedialog.h
@@ -5,7 +5,7 @@
 #ifndef GUI_GetRouteDialog_H
 #define GUI_GETROUTEDIALOG_H
 
-#include "GUIFormBaseDialog.h"
+#include "src/dialogs/GUIFormBaseDialog.h"
 class QLineEdit;
 class QLabel;
 class GetRouteDialog :public  GUIFormBaseDialog {
diff --git a/src/network/networkcfgdialog.cpp b/src/network/networkcfgdialog.cpp
index f890d89..bdf7b71 100644
--- a/src/network/networkcfgdialog.cpp
+++ b/src/network/networkcfgdialog.cpp
@@ -8,7 +8,7 @@
 #include <QItemSelectionModel>
 #include <QGraphicsDropShadowEffect>
 
-#include "guimessagedialog.h"
+#include "src/dialogs/guimessagedialog.h"
 
 #include <QThread>
 networkCfgDialog::networkCfgDialog(QWidget* parent) :
diff --git a/src/networkcfgdialog.ui b/src/network/networkcfgdialog.ui
similarity index 100%
rename from src/networkcfgdialog.ui
rename to src/network/networkcfgdialog.ui
diff --git a/src/InputObject.cpp b/src/utilities/InputObject.cpp
similarity index 100%
rename from src/InputObject.cpp
rename to src/utilities/InputObject.cpp
diff --git a/src/InputObject.h b/src/utilities/InputObject.h
similarity index 100%
rename from src/InputObject.h
rename to src/utilities/InputObject.h
diff --git a/src/StdOutRedirector.cpp b/src/utilities/StdOutRedirector.cpp
similarity index 100%
rename from src/StdOutRedirector.cpp
rename to src/utilities/StdOutRedirector.cpp
diff --git a/src/StdOutRedirector.h b/src/utilities/StdOutRedirector.h
similarity index 100%
rename from src/StdOutRedirector.h
rename to src/utilities/StdOutRedirector.h
diff --git a/src/inputobject.ui b/src/utilities/inputobject.ui
similarity index 100%
rename from src/inputobject.ui
rename to src/utilities/inputobject.ui
diff --git a/src/languageswitcher.cpp b/src/utilities/languageswitcher.cpp
similarity index 100%
rename from src/languageswitcher.cpp
rename to src/utilities/languageswitcher.cpp
diff --git a/src/languageswitcher.h b/src/utilities/languageswitcher.h
similarity index 100%
rename from src/languageswitcher.h
rename to src/utilities/languageswitcher.h
diff --git a/src/locker.cpp b/src/utilities/locker.cpp
similarity index 100%
rename from src/locker.cpp
rename to src/utilities/locker.cpp
diff --git a/src/locker.h b/src/utilities/locker.h
similarity index 100%
rename from src/locker.h
rename to src/utilities/locker.h
diff --git a/src/loginwindow.cpp b/src/windows/loginwindow.cpp
similarity index 98%
rename from src/loginwindow.cpp
rename to src/windows/loginwindow.cpp
index 59f62c6..4126b86 100644
--- a/src/loginwindow.cpp
+++ b/src/windows/loginwindow.cpp
@@ -10,11 +10,11 @@
 #include <QCryptographicHash>
 #include <src/event/EventCenter.h>
 #include "db/SQLHelper.h"
-#include "InputObject.h"
+#include "src/utilities/InputObject.h"
 #include "models/User.h"
 #include "log/UserOperationLog.h"
 #include "json/jsonobject.h"
-#include "guimessagedialog.h"
+#include "src/dialogs/guimessagedialog.h"
 
 LoginWindow::LoginWindow(QWidget* parent)
 	: QDialog(parent)
diff --git a/src/loginwindow.h b/src/windows/loginwindow.h
similarity index 100%
rename from src/loginwindow.h
rename to src/windows/loginwindow.h
diff --git a/src/mainwindow.cpp b/src/windows/mainwindow.cpp
similarity index 97%
rename from src/mainwindow.cpp
rename to src/windows/mainwindow.cpp
index d34ea69..9c76a28 100644
--- a/src/mainwindow.cpp
+++ b/src/windows/mainwindow.cpp
@@ -4,22 +4,22 @@
 #include <QSizePolicy>
 #include <QHBoxLayout>
 #include "event/EventCenter.h"
-#include "tabformwidget.h"
-#include "SelectFormWidget.h"
-#include "ScanFormWidget.h"
-#include "guimessagedialog.h"
+#include "src/forms/tabformwidget.h"
+#include "src/forms/select/SelectFormWidget.h"
+#include "src/forms/scan/ScanFormWidget.h"
+#include "src/dialogs/guimessagedialog.h"
 #include "device/DeviceManager.h"
 #include "errorhandle/GUIErrorHandle.h"
 #include "loginwindow.h"
 #include <QTextEdit>
 #include <QScrollBar>
 #include "models/User.h"
-#include "AdminSettingForm.h"
+#include "src/forms/settings/AdminSettingForm.h"
 #include "appvals/AppGlobalValues.h"
 #include <fstream>
 #include <sstream>
 #include <QDateTime>
-#include "TopBarWidget.h"
+#include "src/forms/TopBarWidget.h"
 #include <QGestureEvent>
 #include <QDockWidget>
 
diff --git a/src/mainwindow.h b/src/windows/mainwindow.h
similarity index 96%
rename from src/mainwindow.h
rename to src/windows/mainwindow.h
index 510f63a..beba157 100644
--- a/src/mainwindow.h
+++ b/src/windows/mainwindow.h
@@ -4,7 +4,7 @@
 #include <QMainWindow>
 #include <QDebug>
 #include <QTimer>
-#include "StdOutRedirector.h"
+#include "src/utilities/StdOutRedirector.h"
 #include "json/cJSON.h"
 #include "loginwindow.h"
 
diff --git a/src/mainwindow.ui b/src/windows/mainwindow.ui
similarity index 100%
rename from src/mainwindow.ui
rename to src/windows/mainwindow.ui